projects
/
grml2usb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
579dda2
428b510
)
Fix merge conflicts
author
Michael Prokop
<mika@grml.org>
Sun, 18 Oct 2009 22:48:30 +0000
(
00:48
+0200)
committer
Michael Prokop
<mika@grml.org>
Sun, 18 Oct 2009 22:48:30 +0000
(
00:48
+0200)
1
2
grml2usb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
grml2usb
Simple merge
projects / grml2usb.git / commitdiff