]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 87117a3 756459c)
Merge branch 'master' into kuniuthefrogg/silentsiege
authorkuniuthefrogg <ekuniu@gmail.com>
Tue, 14 May 2013 21:34:49 +0000 (23:34 +0200)
committerkuniuthefrogg <ekuniu@gmail.com>
Tue, 14 May 2013 21:34:49 +0000 (23:34 +0200)

Trivial merge