Merge remote-tracking branch 'seife/master'

Origin commit data
------------------
Branch: master
Commit: 9f3ac6d7d7
Author: martii <m4rtii@gmx.de>
Date: 2012-10-09 (Tue, 09 Oct 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
martii
2012-10-09 17:00:46 +02:00
29 changed files with 1330 additions and 1 deletions

View File

@@ -8,6 +8,8 @@
#endif
#elif HAVE_AZBOX_HARDWARE
#include "../azbox/audio_lib.h"
#elif HAVE_GENERIC_HARDWARE
#include "../generic-pc/audio_lib.h"
#else
#error neither HAVE_TRIPLEDRAGON nor HAVE_SPARK_HARDWARE defined
#endif