fix conflicts agains bct
authorRobert Manea <gotmor@gmail.com>
Sun, 12 Jul 2009 20:35:03 +0000 (22:35 +0200)
committerRobert Manea <gotmor@gmail.com>
Sun, 12 Jul 2009 20:35:03 +0000 (22:35 +0200)
commitb08d5da414229b962227ed42de2fc137c52104aa
tree031afec0388e38c74121fedabc675c1c7bd3f6ee
parent23554072f47c0f75a302c57b26d1a7d1905150fc
parente39152702c839cafe5a73536ba6d3c3d769d4546
fix conflicts agains bct
uzbl.c
uzbl.h