]> 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 | combined (merge: c6de5cf 4cb0e0c)
Merge branch 'TimePath/combined_updates' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 14 Dec 2014 11:38:28 +0000 (11:38 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 14 Dec 2014 11:38:28 +0000 (11:38 +0000)
TimePath/combined_updates

samual/combined_updates without the bad merge with nyov's effects changes

See merge request !50


Trivial merge