projects
/
uzbl-mobile
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
30ea3bf
df1d2a4
)
fix conflicts
author
Robert Manea
<gotmor@gmail.com>
Sat, 23 May 2009 12:15:49 +0000
(14:15 +0200)
committer
Robert Manea
<gotmor@gmail.com>
Sat, 23 May 2009 12:15:49 +0000
(14:15 +0200)
1
2
examples/configs/sampleconfig-dev
patch
|
diff1
|
diff2
|
blob
|
history
uzbl.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
examples/configs/sampleconfig-dev
Simple merge
diff --cc
uzbl.c
Simple merge
projects / uzbl-mobile / commitdiff