Merge remote-tracking branch 'seife/master'

Origin commit data
------------------
Branch: master
Commit: 6f4449e1c5
Author: martii <m4rtii@gmx.de>
Date: 2013-10-06 (Sun, 06 Oct 2013)


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

------------------
This commit was generated by Migit
This commit is contained in:
martii
2013-10-06 14:41:32 +02:00
35 changed files with 1836 additions and 2 deletions

View File

@@ -7,7 +7,11 @@
#elif HAVE_AZBOX_HARDWARE
#include "../azbox/audio_lib.h"
#elif HAVE_GENERIC_HARDWARE
#if BOXMODEL_RASPI
#include "../raspi/audio_lib.h"
#else
#include "../generic-pc/audio_lib.h"
#endif
#else
#error neither HAVE_TRIPLEDRAGON nor HAVE_SPARK_HARDWARE defined
#endif