Commit Graph

18 Commits

Author SHA1 Message Date
Stefan Seyfried
8253c4d67c Merge remote-tracking branch 'check/next-cc'
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
2013-05-10 10:06:47 +02:00
Jacek Jendrzej
ddc9229efc use var passed by reference 2013-04-18 19:19:30 +02:00
Stefan Seyfried
a0c277eaac libnet: avoid type-punning compiler warning 2013-03-24 17:02:44 +01:00
[CST] Focus
c5f4c53fb7 lib/libnet/libnet.c: fix unused variable warning 2012-08-04 14:14:08 +04:00
satbaby
9124c20f31 comment out never used 2012-08-04 10:03:19 +02:00
satbaby
060c1c45b2 fix gcc 4.7.x warnings 2012-07-07 13:09:08 +02:00
satbaby
bb347b3a44 performance Prefer prefix ++/-- operators for non-primitive types. 2012-04-28 10:56:27 +02:00
satbaby
bef69b39f3 init variable
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1593 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-07-23 14:02:33 +00:00
focus
ddbbb73760 Add netGetMacAddr function
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1301 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-03-16 10:52:08 +00:00
focus
5c2dcd4008 Add additional attributes for wireless interface
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1300 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-03-16 10:51:21 +00:00
satbaby
85f5e1110d memcpy -> memmove
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1278 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-03-09 12:55:31 +00:00
satbaby
42fab7d679 bzero -> memset
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1277 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-03-09 12:40:37 +00:00
focus
4049d9a584 Hostname, #271. rcS needs hostname -F /etc/hostname before ifup
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@487 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-03-16 11:39:58 +00:00
seife
6a69be899d try to correct mws's fuckup by disabling exceptions again
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@120 e54a6e83-5905-42d5-8d5c-058d10e6a962
2009-12-26 11:28:12 +00:00
mws
af888b3372 error: declaration of 'in' shadows a previous local
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@110 e54a6e83-5905-42d5-8d5c-058d10e6a962
2009-12-22 12:37:15 +00:00
mws
e57d1f7ed8 error: declaration of 'index' shadows a global declaration
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@109 e54a6e83-5905-42d5-8d5c-058d10e6a962
2009-12-22 12:35:09 +00:00
mws
5a7570a6ba fix Makefiles to comply to C and CPP rules
announcement -Wall -Werror will force compile breaking in
the near future. 



git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@58 e54a6e83-5905-42d5-8d5c-058d10e6a962
2009-12-16 14:24:21 +00:00
mrcolor
bc5bd4154e our current experimental Neutrino branch
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962
2009-12-08 11:05:11 +00:00