projects
/
uzbl-mobile
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e6f0542
b6b60c7
)
Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into dieter/experimental
author
dusanx
<ef_dva@yahoo.com>
Mon, 27 Apr 2009 22:17:39 +0000
(
00:17
+0200)
committer
dusanx
<ef_dva@yahoo.com>
Mon, 27 Apr 2009 22:17:39 +0000
(
00:17
+0200)
Conflicts:
uzbl.c
1
2
uzbl.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
uzbl.c
Simple merge