projects
/
irwi
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
72d3369
354dbd2
)
Merge branch 'master' of mercury.wipsl.com:/var/git/irwi
author
Torste Aikio
<zokier@zokier.laptop>
Tue, 29 Jun 2010 12:46:01 +0000
(15:46 +0300)
committer
Torste Aikio
<zokier@zokier.laptop>
Tue, 29 Jun 2010 12:46:01 +0000
(15:46 +0300)
1
2
src/remote.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/remote.cpp
Simple merge