]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45b2179 48837fe)
Merge remote-tracking branch 'origin/matthiaskrgr/gitignore'
authorRudolf Polzer <divverent@xonotic.org>
Sun, 16 Jun 2013 16:33:06 +0000 (18:33 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 16 Jun 2013 16:33:06 +0000 (18:33 +0200)

Trivial merge