]> 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 | compact (merge: cab4567 132af39)
Merge branch 'TimePath/xonotic-data.pk3dir-TimePath/compat_weapons'
authorMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 02:41:58 +0000 (13:41 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 02:41:58 +0000 (13:41 +1100)

Trivial merge