projects / uzbl-mobile / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 77ccea2 361d670)
Merge commit 'dieterbe/config-refactor' into experimental
authorDuClare <akarinotengoku@gmail.com>
Tue, 12 May 2009 19:26:59 +0000 (22:26 +0300)
committerDuClare <akarinotengoku@gmail.com>
Tue, 12 May 2009 19:26:59 +0000 (22:26 +0300)
Conflicts:
examples/configs/sampleconfig
examples/configs/sampleconfig-dev

1  2 
uzbl.c patch | diff1 | diff2 | blob | history
uzbl.h patch | diff1 | diff2 | blob | history

diff --cc uzbl.c
Simple merge
diff --cc uzbl.h
Simple merge
Unnamed repository; edit this file to name it for gitweb.