Merge branch 'experimental' of git://github.com/Dieterbe/uzbl
authorRobert Manea <gotmor@gmail.com>
Sun, 26 Jul 2009 07:04:43 +0000 (09:04 +0200)
committerRobert Manea <gotmor@gmail.com>
Sun, 26 Jul 2009 07:04:43 +0000 (09:04 +0200)
1  2 
uzbl.c
uzbl.h

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