]> 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: 38aa70b b91ad35)
Merge remote-tracking branch 'origin/Mario/ignore_files'
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 18 Sep 2014 14:34:43 +0000 (16:34 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 18 Sep 2014 14:34:43 +0000 (16:34 +0200)
* origin/Mario/ignore_files:
  Ignore some compiler files


Trivial merge