Michael Liebmann a19fe6bed0 Fix merge conflicts ...

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


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

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

2016-08-20 09:01:33 +02:00

..

Debug.cpp

testing dvb subtitles

2009-12-29 18:33:45 +00:00

Debug.hpp

our current experimental Neutrino branch

2009-12-08 11:05:11 +00:00

dvbsub.cpp

Merge branch 'cst-next' into nmp-cst-next

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

dvbsub.h

Attempt to fix #233

2010-02-03 16:04:27 +00:00

dvbsubtitle.cpp

Fix merge conflicts

2016-08-20 09:01:33 +02:00

dvbsubtitle.h

libdvbsub: fix compile with new mandatory -D__STDC_CONSTANT_MACROS compiler flag

2015-10-13 14:04:10 +02:00

helpers.cpp

change 'long long' tom int64_t'; change variable buf to new delete;

2010-02-07 14:32:21 +00:00

helpers.hpp

our current experimental Neutrino branch

2009-12-08 11:05:11 +00:00

Makefile.am

port HWLIB_CFLAGS from neutrino-mp to neutrino-hd

2016-01-14 22:29:00 +01:00

PacketQueue.cpp

our current experimental Neutrino branch

2009-12-08 11:05:11 +00:00

PacketQueue.hpp

our current experimental Neutrino branch

2009-12-08 11:05:11 +00:00

tools.cpp

comment warning off

2009-12-16 15:58:14 +00:00

tools.h

lib/libdvbsub/tools.h unused

2016-04-16 18:07:16 +02:00