]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc64d34 a4ccbd7)
Merge branch 'master' into terencehill/forced_intermission_eventchase
authorterencehill <piuntn@gmail.com>
Fri, 27 Apr 2012 21:50:04 +0000 (23:50 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 27 Apr 2012 21:50:04 +0000 (23:50 +0200)

Trivial merge