Merge in xonotic/xonotic-data.pk3dir.git: samual/replace_rifle_secondary_sound
git-manager created issue #621 (closed) on 2011-08-29T06:59:57Z:
Purpose of the branch:
Rifle secondary was using the old silenced sound accidentally... Since the secondary changed, I replaced the secondary sound with the previous one. (Of course by tenshihan, since it's the same as the old one before FruitieX silenced it)
Repository: xonotic/xonotic-data.pk3dir.git Commit: 903e3d22 Branch: samual/replace_rifle_secondary_sound
Merge commands:
cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '903e3d22eb9a6482f0e4894be30d54b371cdf353'..'origin/samual/replace_rifle_secondary_sound'
# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes
git merge --no-ff 'origin/samual/replace_rifle_secondary_sound'
# please make sure this merge worked, and if not, fix merge conflicts and git
# commit BEFORE the next command
#
# also, THIS is the point to do final pre-merge testing
#
# use git reset --hard origin/master to bail out
git push && git push --delete origin 'samual/replace_rifle_secondary_sound'
Diffstat:
sound/weapons/campingrifle_fire2.ogg | Bin 0 -> 37179 bytes
sound/weapons/campingrifle_fire2.wav | Bin 48562 -> 0 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
Revision log:
commit 903e3d22eb9a6482f0e4894be30d54b371cdf353
Author: Samual
Commit: Samual
Replace the campingrifle secondary sound with one which isn't silenced (the old one was for old secondary) -- I didn't notice this as I had locally replaced it in my data directory and never noticed it was wrong in master
User agreed to the GPLv2+.
Diff:
diff --git a/sound/weapons/campingrifle_fire2.ogg b/sound/weapons/campingrifle_fire2.ogg
new file mode 100644
index 0000000..721b37b
Binary files /dev/null and b/sound/weapons/campingrifle_fire2.ogg differ
diff --git a/sound/weapons/campingrifle_fire2.wav b/sound/weapons/campingrifle_fire2.wav
deleted file mode 100644
index 66bda4f..0000000
Binary files a/sound/weapons/campingrifle_fire2.wav and /dev/null differ