]> 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: 00530e3 7bd0999)
Merge remote-tracking branch 'origin/samual/team_macros'
authorSamual Lenks <samual@xonotic.org>
Sat, 14 Sep 2013 04:03:40 +0000 (00:03 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 14 Sep 2013 04:03:40 +0000 (00:03 -0400)
* origin/samual/team_macros:
  Make some nice macros for team comparisons


Trivial merge