projects
/
paraslash.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5a506c5
39f4ce8
)
Merge branch 'master' into aac
author
Andre
<maan@p133.(none)>
Fri, 12 May 2006 15:00:10 +0000
(17:00 +0200)
committer
Andre
<maan@p133.(none)>
Fri, 12 May 2006 15:00:10 +0000
(17:00 +0200)
Conflicts:
Makefile.in
Makefile.in looks fine. WTF is git complaining about?
Trivial merge