Merge in xonotic/xonotic-music.pk3dir.git: cbrutail/cdtrack-speek_the_2nd_coming_nospeek
git-manager created issue #510 on 2011-06-12T19:41:56Z:
Purpose of the branch:
My map Lightspeed needs it
Repository: xonotic/xonotic-music.pk3dir.git Commit: cd8d27f5035632f27a180c52ed5758b6423d529a Branch: cbrutail/cdtrack-speek_the_2nd_coming_nospeek
Merge commands:
cd data/xonotic-music.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff 'cd8d27f5035632f27a180c52ed5758b6423d529a'..'origin/cbrutail/cdtrack-speek_the_2nd_coming_nospeek'
# 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/cbrutail/cdtrack-speek_the_2nd_coming_nospeek'
# 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 'cbrutail/cdtrack-speek_the_2nd_coming_nospeek'
Diffstat:
sound/cdtracks/tspeek_the_2nd_coming.ogg | Bin 0 -> 12915983 bytes
1 files changed, 0 insertions(+), 0 deletions(-)
Revision log:
commit cd8d27f5035632f27a180c52ed5758b6423d529a
Author: cbrutail
Commit: cbrutail
New soundtrack file from chooksta. This supposed to be the music of Lightspeed. It's a special edition, as I've asked him to remove the distorted speech effects.
User agreed to the GPLv2+.
Diff:
diff --git a/sound/cdtracks/tspeek_the_2nd_coming.ogg b/sound/cdtracks/tspeek_the_2nd_coming.ogg
new file mode 100644
index 0000000..fbf9ee5
Binary files /dev/null and b/sound/cdtracks/tspeek_the_2nd_coming.ogg differ