Merge branch 'config-refactor' of git://github.com/Dieterbe/uzbl into config-refactor
authorRobert Manea <gotmor@gmail.com>
Fri, 15 May 2009 19:23:43 +0000 (21:23 +0200)
committerRobert Manea <gotmor@gmail.com>
Fri, 15 May 2009 19:23:43 +0000 (21:23 +0200)
1  2 
uzbl.c
uzbl.h

diff --cc uzbl.c
Simple merge
diff --cc uzbl.h
Simple merge