vcs.maemo.org Git - uzbl-mobile/commit

author	Brendan Taylor <whateley@gmail.com>
	Fri, 17 Jul 2009 00:01:24 +0000 (18:01 -0600)
committer	Brendan Taylor <whateley@gmail.com>
	Fri, 17 Jul 2009 00:01:24 +0000 (18:01 -0600)
commit	87319b49b48fc54cbca58f830b5e7f61b79e6ff7
tree	0be3b4ac50af732d25cc8aec08e0949e6d401e7c	tree \| snapshot
parent	1c079d2ab38b87f2abb3d980ec9b43200d2711e0	commit \| diff
parent	771d31746357df349308cb4094f2873837e90a24	commit \| diff

Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into replace-expand-template

Conflicts:
Makefile
tests/Makefile
uzbl.c
uzbl.h

Unnamed repository; edit this file to name it for gitweb.