Merge branch 'master' of https://bitbucket.org/brycecovertoperations/advent

2015-10-10 22:18:25 -07:00
parent 44b39cc4d0 9186c095d1
commit 1dd907fbbb
29 changed files with 83 additions and 25 deletions
--- a/desktop/asset-work/cat-tree/ladder-break.ogg
+++ b/desktop/asset-work/cat-tree/ladder-break.ogg
--- a/desktop/asset-work/cat-tree/ladder-break.wav
+++ b/desktop/asset-work/cat-tree/ladder-break.wav
--- a/desktop/asset-work/ego/drop.ogg
+++ b/desktop/asset-work/ego/drop.ogg
--- a/desktop/asset-work/ego/drop.wav
+++ b/desktop/asset-work/ego/drop.wav
--- a/desktop/asset-work/inside-jail/exhale.ogg
+++ b/desktop/asset-work/inside-jail/exhale.ogg
--- a/desktop/asset-work/inside-jail/exhale.wav
+++ b/desktop/asset-work/inside-jail/exhale.wav
--- a/desktop/asset-work/inside-jail/guard-crash.ogg
+++ b/desktop/asset-work/inside-jail/guard-crash.ogg
--- a/desktop/asset-work/inside-jail/guard-crash.wav
+++ b/desktop/asset-work/inside-jail/guard-crash.wav
--- a/desktop/asset-work/inside-jail/inhale.ogg
+++ b/desktop/asset-work/inside-jail/inhale.ogg
--- a/desktop/asset-work/inside-jail/inhale.wav
+++ b/desktop/asset-work/inside-jail/inhale.wav
--- a/desktop/asset-work/inside-jail/open-door.ogg
+++ b/desktop/asset-work/inside-jail/open-door.ogg
--- a/desktop/asset-work/inside-jail/open-door.wav
+++ b/desktop/asset-work/inside-jail/open-door.wav
--- a/desktop/asset-work/inside-jail/squeak.ogg
+++ b/desktop/asset-work/inside-jail/squeak.ogg
--- a/desktop/asset-work/inside-jail/squeak.wav
+++ b/desktop/asset-work/inside-jail/squeak.wav