Merge branch 'master' into MusicalProgrammer

2018-05-30 21:19:46 -04:00
parent cd0f1617cb
commit 828c0dcb41
16 changed files with 599 additions and 483 deletions
--- a/AudioPlayer.h
+++ b/AudioPlayer.h
@@ -6,6 +6,6 @@ class AudioPlayer
 public:
 	AudioPlayer(void);
 	~AudioPlayer(void);
-	static void PlaySound(std::string);
+	static void playSound(std::string);
 	static void init();
 };