fixed broken merge
authorSylvester Johansson <scj@archlinux.us>
Mon, 1 Jun 2009 12:31:43 +0000 (14:31 +0200)
committerSylvester Johansson <scj@archlinux.us>
Mon, 1 Jun 2009 12:31:43 +0000 (14:31 +0200)
commit0ef46333e1a68130afb16b038852de1344b0e499
treec538c9f86dcedc8a6cafcec16cd09d4fe05d79e2
parent16bb4ad6493cb7e5b4c15014670106428085deb3
fixed broken merge
uzbl.c
uzbl.h