]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1606117 5a21a1f)
Merge remote-tracking branch 'gitlab/TimePath/unified_weapons' into TimePath/unified_...
authorTimePath <andrew.hardaker1995@gmail.com>
Mon, 28 Sep 2015 05:01:24 +0000 (15:01 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Mon, 28 Sep 2015 05:02:55 +0000 (15:02 +1000)

Trivial merge