projects / uzbl-mobile / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b52ae2 fedfe2c)
fix conflicts
authorRobert Manea <gotmor@gmail.com>
Tue, 16 Jun 2009 07:59:59 +0000 (09:59 +0200)
committerRobert Manea <gotmor@gmail.com>
Tue, 16 Jun 2009 07:59:59 +0000 (09:59 +0200)
1  2 
uzbl.c patch | diff1 | diff2 | blob | history

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