Fix merge conflicts from salinasv which git didn't tell me about...
authorBarrucadu <mike@barrucadu.co.uk>
Tue, 19 May 2009 19:06:14 +0000 (20:06 +0100)
committerBarrucadu <mike@barrucadu.co.uk>
Tue, 19 May 2009 19:06:14 +0000 (20:06 +0100)
commit2e4dfe9c23165f32c5161dd2c4dbf09c60e10191
treec52a1a69b95fbaf1fce21b4eb91183996eeb5e09
parent6ac8a0d07f02dd99a78d3569a6637e5ea44e5cb0
Fix merge conflicts from salinasv which git didn't tell me about...
uzbl.c
uzbl.h