Merge commit 'dieterbe/experimental'
authorSylvester Johansson <scj@archlinux.us>
Mon, 1 Jun 2009 12:07:26 +0000 (14:07 +0200)
committerSylvester Johansson <scj@archlinux.us>
Mon, 1 Jun 2009 12:07:26 +0000 (14:07 +0200)
commitaa03a11176e42cc21bca894e0141bf90fc80959b
tree83835d393a4ecc60d0072e96f51f38c2bdce224f
parentafce27422a221c718958a06a1e7f804f0a59003d
parentfe60a9f75d740d555631ce2506ea78abffb69c19
Merge commit 'dieterbe/experimental'
examples/configs/sampleconfig
uzbl.c
uzbl.h