From 0626f36c33c0ad136d0b6d5b854b01867fc54f66 Mon Sep 17 00:00:00 2001
From: Chris Ball <cjb@pullcord.laptop.org>
Date: Wed, 29 Aug 2007 18:02:36 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/pippy-activity

---
(limited to 'data')

diff --git a/data/sound/getSoundList b/data/sound/getSoundList
index 09876c1..44c026d 100644
--- a/data/sound/getSoundList
+++ b/data/sound/getSoundList
@@ -1,7 +1,7 @@
 import sys
 from sugar.activity.activity import get_bundle_path
 sys.path.append(get_bundle_path() + '/sound')
-from snd import *
+from sound import *
 
 for sound in sorted(getSoundList()):
     print sound
diff --git a/data/sound/playSine b/data/sound/playSine
index a641b72..cd97576 100644
--- a/data/sound/playSine
+++ b/data/sound/playSine
@@ -1,7 +1,7 @@
 import sys
 from sugar.activity.activity import get_bundle_path
 sys.path.append(get_bundle_path() + '/sound')
-from snd import *
+from sound import *
 
 playSine()
 audioOut()
diff --git a/data/sound/playWave b/data/sound/playWave
index 471ca31..27605bd 100644
--- a/data/sound/playWave
+++ b/data/sound/playWave
@@ -1,7 +1,7 @@
 import sys
 from sugar.activity.activity import get_bundle_path
 sys.path.append(get_bundle_path() + '/sound')
-from snd import *
+from sound import *
 
 playWave(sound='didjeridu', loop=True, duration=5)
 audioOut()
diff --git a/data/sound/sequence b/data/sound/sequence
index 1bdc966..1577c9d 100644
--- a/data/sound/sequence
+++ b/data/sound/sequence
@@ -2,7 +2,7 @@ import sys
 import random
 from sugar.activity.activity import get_bundle_path
 sys.path.append(get_bundle_path() + '/sound')
-from snd import *
+from sound import *
 
 for i in range(25):
     pitch = random.randint(500,2000)
diff --git a/data/sound/sndInfo b/data/sound/sndInfo
index 0a337f9..529995e 100644
--- a/data/sound/sndInfo
+++ b/data/sound/sndInfo
@@ -1,6 +1,6 @@
 import sys
 from sugar.activity.activity import get_bundle_path
 sys.path.append(get_bundle_path() + '/sound')
-from snd import *
+from sound import *
 
 print playSine.__doc__
--
cgit v0.9.1