Merge commit 'dieterbe/config-refactor' into experimental
authorDuClare <akarinotengoku@gmail.com>
Tue, 12 May 2009 19:26:59 +0000 (22:26 +0300)
committerDuClare <akarinotengoku@gmail.com>
Tue, 12 May 2009 19:26:59 +0000 (22:26 +0300)
commit692b76e8717bbf5054abb9ceb5e8a4b71c8b7542
tree099918e80c7b9a88956d9ebbb89011e0fc3005d3
parent77ccea2297831ec45a9086cd06ab0360d5082b2a
parent361d670520cb10efa25383b982eb85cab0ef8003
Merge commit 'dieterbe/config-refactor' into experimental

Conflicts:
examples/configs/sampleconfig
examples/configs/sampleconfig-dev
uzbl.c
uzbl.h