]> 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: 1bc702d a34c7d6)
Merge branch 'master' into Lyberta/WaypointIcons
authorLyberta <lyberta@lyberta.net>
Wed, 22 Aug 2018 10:35:30 +0000 (13:35 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 22 Aug 2018 10:35:30 +0000 (13:35 +0300)
1  2 
qcsrc/common/items/item.qh patch | diff1 | diff2 | blob | history
qcsrc/common/items/item/powerup.qh patch | diff1 | diff2 | blob | history
qcsrc/common/mutators/mutator/waypoints/all.inc patch | diff1 | diff2 | blob | history
qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/items/item.qh
Simple merge
diff --cc qcsrc/common/items/item/powerup.qh
Simple merge