Merge branch 'experimental' of git://github.com/Dieterbe/uzbl
authorsalinasv <salinasv@gmail.com>
Sun, 17 May 2009 20:46:22 +0000 (15:46 -0500)
committersalinasv <salinasv@gmail.com>
Sun, 17 May 2009 20:46:22 +0000 (15:46 -0500)
commitcd7b17796013f1afcdedc9e39ca4565ecdd57fd1
tree04ec48b14d88cde3e69a0000cc88d435ec0d5d23
parent7dc4f6757170638977d8a0a2fd8ef6fbd4bc7c8d
parent8ed329a044b35a5db60f0c54e372c24cb1b97179
Merge branch 'experimental' of git://github.com/Dieterbe/uzbl
examples/configs/sampleconfig
examples/configs/sampleconfig-dev
uzbl.c