]> 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: deac99b 00a47cc)
Merge branch 'master' into LegendaryGuard/new_powerups
authorLegendaryGuard <rootuser999@gmail.com>
Wed, 7 Jun 2023 11:11:41 +0000 (13:11 +0200)
committerLegendaryGuard <rootuser999@gmail.com>
Wed, 7 Jun 2023 11:11:41 +0000 (13:11 +0200)
1  2 
qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh patch | diff1 | diff2 | blob | history
qcsrc/common/mutators/mutator/powerups/powerup/shield.qh patch | diff1 | diff2 | blob | history
qcsrc/common/mutators/mutator/powerups/powerup/speed.qh patch | diff1 | diff2 | blob | history
qcsrc/common/mutators/mutator/powerups/powerup/strength.qh patch | diff1 | diff2 | blob | history
qcsrc/common/notifications/all.inc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/notifications/all.inc
Simple merge