Michael Liebmann 2c4ccf9555 Merge branch 'cst-next' into nmp-cst-next ...

- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit

2016-08-19 17:40:48 +02:00

..

audio_cs.h

libcoolstream2: sync headers

2014-02-21 20:01:14 +04:00

ca_cs.h

libcoolstream2: sync headers

2014-02-21 20:01:14 +04:00

cnxtfb.h

lib/libcoolstream2/cnxtfb.h: only define FBIO_WAITFORVSYNC if it's not defined yet by kernel headers.

2015-02-22 17:23:06 +03:00

control.h

lib/libcoolstream2: sync control headers

2013-01-18 16:53:40 +04:00

cs_api.h

lib/libcoolstream2/cs_api.h: update header

2016-04-14 17:28:32 +03:00

cs_frontpanel.h

Adapt neutrino-mp for CST hardware part #1

2016-01-16 07:26:04 +01:00

cs_ir_generic.h

lib/libcoolstream2: directory for apollo headers

2013-01-11 13:59:17 +04:00

cs_types.h

lib/libcoolstream2: directory for apollo headers

2013-01-11 13:59:17 +04:00

cs_vfd.h

lib/libcoolstream2: directory for apollo headers

2013-01-11 13:59:17 +04:00

dmx_cs.h

some enum warrnings compil fixes

2015-02-15 22:16:47 +01:00

hardware_caps.cpp

libcoolstream: Add boxarch to hw_caps

2016-01-25 13:53:39 +01:00

hardware_caps.h

libcoolstream: Add boxarch to hw_caps

2016-01-25 13:53:39 +01:00

Makefile.am

Adapt neutrino-mp for CST hardware part #3

2016-01-16 07:26:04 +01:00

mmi.h

mmi.h, cam_menu.cpp fix spelling error

2014-01-22 12:27:07 +04:00

nevis_ir.h

lib/libcoolstream2: directory for apollo headers

2013-01-11 13:59:17 +04:00

playback_cs.h

libcoolstream2/playback_cs.h: update header

2016-03-25 19:04:32 +03:00

playback.h

lib/libcoolstream2: directory for apollo headers

2013-01-11 13:59:17 +04:00

pwrmngr.h

lib/libcoolstream2: directory for apollo headers

2013-01-11 13:59:17 +04:00

record_cs.h

lib/libcoolstream2: directory for apollo headers

2013-01-11 13:59:17 +04:00

tsrouter.h

lib/libcoolstream2: sync control headers

2013-01-18 16:53:40 +04:00

video_cs.h

some enum warrnings compil fixes

2015-02-15 22:16:47 +01:00