merge in some fixes + basic uzbl icon from uranther
authorDieter Plaetinck <dieter@plaetinck.be>
Sun, 7 Jun 2009 18:05:21 +0000 (20:05 +0200)
committerDieter Plaetinck <dieter@plaetinck.be>
Sun, 7 Jun 2009 18:05:21 +0000 (20:05 +0200)
1  2 
Makefile
uzbl.c

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