From: cbrutail <ruszkai.akos@gmail.com>
Date: Tue, 3 Jan 2012 23:46:24 +0000 (+0100)
Subject: Merge branch 'cbrutail/reorganise_sounds1' into cbrutail/darkzone
X-Git-Tag: xonotic-v0.6.0~5^2~25
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=ca4082a9b7015571fc18f2a6b71a3aac45647f48;hp=a133c10733063bd19dcfbf8b3bf2f74cd5675556

Merge branch 'cbrutail/reorganise_sounds1' into cbrutail/darkzone
---

diff --git a/sound/machines/lighthum_looped.ogg b/sound/machines/lighthum_looped.ogg
new file mode 100644
index 00000000..89eaa214
Binary files /dev/null and b/sound/machines/lighthum_looped.ogg differ
diff --git a/sound/machines/pumps_looped.ogg b/sound/machines/pumps_looped.ogg
new file mode 100644
index 00000000..b7f7b3ef
Binary files /dev/null and b/sound/machines/pumps_looped.ogg differ
diff --git a/sound/map_leave_em_behind/lighthum.ogg b/sound/map_leave_em_behind/lighthum.ogg
deleted file mode 100644
index f7456d58..00000000
Binary files a/sound/map_leave_em_behind/lighthum.ogg and /dev/null differ
diff --git a/sound/map_leave_em_behind/pumps.ogg b/sound/map_leave_em_behind/pumps.ogg
deleted file mode 100644
index 85a76a52..00000000
Binary files a/sound/map_leave_em_behind/pumps.ogg and /dev/null differ