]> de.git.xonotic.org Git - xonotic/netradiant-xonoticpack.git/commitdiff
projects / xonotic / netradiant-xonoticpack.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f7d0dd 24b4cf6)
Merge branch 'master' of ssh://git.xonotic.org/netradiant-xonoticpack
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 1 Jul 2011 09:30:39 +0000 (11:30 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 1 Jul 2011 09:30:39 +0000 (11:30 +0200)
Conflicts:
games/xonotic.game


Trivial merge