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 (file)
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 (file)
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 (file)
index 0000000..6fd5b2a
Binary files /dev/null and b/sound/cdtracks/rising-of-the-phoenix/synthetic_explosion_1.flac differ