From: Rudolf Polzer Date: Fri, 13 Aug 2010 19:06:58 +0000 (+0200) Subject: Merge remote branch 'refs/remotes/origin/divVerent/rising-of-the-phoenix' X-Git-Tag: xonotic-v0.1.0preview~23 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fmediasource.git;a=commitdiff_plain;h=4f0e0dcbb6e59c72598f03e2d2bd5d6a67322758;hp=9d9d763ceddb75bf280c9ec3eb2d26f750157a95 Merge remote branch 'refs/remotes/origin/divVerent/rising-of-the-phoenix' --- diff --git a/sound/cdtracks/rising-of-the-phoenix/DM_wfl5.5_snap.wav b/sound/cdtracks/rising-of-the-phoenix/DM_wfl5.5_snap.wav new file mode 100644 index 0000000..b0fa20e Binary files /dev/null and b/sound/cdtracks/rising-of-the-phoenix/DM_wfl5.5_snap.wav differ diff --git a/sound/cdtracks/rising-of-the-phoenix/Xonotic 3 - GPL.mmpz b/sound/cdtracks/rising-of-the-phoenix/Xonotic 3 - GPL.mmpz new file mode 100644 index 0000000..60ad647 Binary files /dev/null and b/sound/cdtracks/rising-of-the-phoenix/Xonotic 3 - GPL.mmpz differ diff --git a/sound/cdtracks/rising-of-the-phoenix/synthetic_explosion_1.flac b/sound/cdtracks/rising-of-the-phoenix/synthetic_explosion_1.flac new file mode 100644 index 0000000..6fd5b2a Binary files /dev/null and b/sound/cdtracks/rising-of-the-phoenix/synthetic_explosion_1.flac differ