merge public git changes

Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e41c65fad
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-09 (Wed, 09 Jan 2013)


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

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2013-01-09 19:30:07 +04:00
57 changed files with 804 additions and 227 deletions

View File

@@ -47,10 +47,6 @@
#include <sys/wait.h>
#include <sys/ioctl.h>
#if HAVE_COOL_HARDWARE
#include <coolstream/control.h>
#endif
#include <config.h>
#include <global.h>