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

..

.svnignore

…

audio_cs.h

libcs headers update

2012-03-28 16:16:09 +00:00

ca_cs.h

libcoolstream/ca_cs.h: sync header

2013-03-08 17:56:03 +04:00

cnxtfb.h

fix comma at end of enumerator list

2013-05-28 15:52:31 +02:00

control.h

lib/libcoolstream: sync headers

2013-01-11 11:10:58 +04:00

cs_api.h

lib/libcoolstream: sync headers

2013-01-11 11:10:58 +04:00

cs_frontpanel.h

fix comma at end of enumerator list

2013-05-28 15:52:31 +02:00

cs_types.h

lib/libcoolstream: sync headers

2013-01-11 11:10:58 +04:00

cs_vfd.h

fix comma at end of enumerator list

2013-05-28 15:52:31 +02:00

dmx_cs.h

libcs headers update

2012-03-28 16:16:09 +00: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

svn_CROSSENVIRONMENT_coolstream: move files to new right place

2012-12-13 10:49:06 +01:00

playback_cs.h

libcoolstream2/playback_cs.h: update header

2016-03-28 13:29:57 +03:00

playback.h

…

pwrmngr.h

…

record_cs.h

lib/libcoolstream/record_cs.h: update header

2012-09-25 17:13:43 +04:00

tsrouter.h

lib/libcoolstream: sync headers

2013-01-11 11:10:58 +04:00

video_cs.h

configure: define SCREENSHOT in config.h

2015-02-25 21:13:05 +01:00