]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: 592d77d)
better handling of merge conflicts
authorRudolf Polzer <rpolzer@grawp.(none)>
Fri, 2 Apr 2010 19:11:17 +0000 (21:11 +0200)
committerRudolf Polzer <rpolzer@grawp.(none)>
Fri, 2 Apr 2010 19:11:17 +0000 (21:11 +0200)

No differences found