]> de.git.xonotic.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8a00fda 828804e)
Merge remote-tracking branch 'illwieckz/keepshader'
authorTimePath <andrew.hardaker1995@gmail.com>
Thu, 14 Apr 2016 03:02:09 +0000 (13:02 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Thu, 14 Apr 2016 03:02:09 +0000 (13:02 +1000)

Trivial merge