mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,940 Commits 2 Branches 9 Tags
b011ff37b9cd2f7cf30103d5a6b51c4e6e96b927
Commit Graph

18 Commits

Author SHA1 Message Date
Stefan Seyfried
f6c0718366 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


Origin commit data
------------------
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)
 2013-05-10 10:06:47 +02:00
Jacek Jendrzej
d0cddc8afd use var passed by reference 
Origin commit data
------------------
Commit: ddc9229efc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-18 (Thu, 18 Apr 2013)
 2013-04-18 19:19:30 +02:00
Stefan Seyfried
d8e1cae899 libnet: avoid type-punning compiler warning 
Origin commit data
------------------
Commit: a0c277eaac
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-24 (Sun, 24 Mar 2013)
 2013-03-24 17:02:44 +01:00
[CST] Focus
179b0a02e1 lib/libnet/libnet.c: fix unused variable warning 
Origin commit data
------------------
Commit: c5f4c53fb7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-04 (Sat, 04 Aug 2012)
 2012-08-04 14:14:08 +04:00
Jacek Jendrzej
41e57ce7bc comment out never used 
Origin commit data
------------------
Commit: 9124c20f31
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-08-04 (Sat, 04 Aug 2012)
 2012-08-04 10:03:19 +02:00
Jacek Jendrzej
803674f9df fix gcc 4.7.x warnings 
Origin commit data
------------------
Commit: 060c1c45b2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-07-07 (Sat, 07 Jul 2012)
 2012-07-07 13:09:08 +02:00
Jacek Jendrzej
04be37cf14 performance Prefer prefix ++/-- operators for non-primitive types. 
Origin commit data
------------------
Commit: bb347b3a44
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-04-28 (Sat, 28 Apr 2012)
 2012-04-28 10:56:27 +02:00
Jacek Jendrzej
76a83200b2 init variable 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1593 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: bef69b39f3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-07-23 (Sat, 23 Jul 2011)
 2011-07-23 14:02:33 +00:00
[CST] Focus
0daa600fb4 Add netGetMacAddr function 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1301 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: ddbbb73760
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-03-16 (Wed, 16 Mar 2011)
 2011-03-16 10:52:08 +00:00
[CST] Focus
5885def8d0 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


Origin commit data
------------------
Commit: 5c2dcd4008
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-03-16 (Wed, 16 Mar 2011)
 2011-03-16 10:51:21 +00:00
Jacek Jendrzej
4ae229aea7 memcpy -> memmove 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1278 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 85f5e1110d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-03-09 (Wed, 09 Mar 2011)
 2011-03-09 12:55:31 +00:00
Jacek Jendrzej
9687d100f1 bzero -> memset 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1277 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 42fab7d679
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-03-09 (Wed, 09 Mar 2011)
 2011-03-09 12:40:37 +00:00
[CST] Focus
9318d88afa 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


Origin commit data
------------------
Commit: 4049d9a584
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-03-16 (Tue, 16 Mar 2010)
 2010-03-16 11:39:58 +00:00
Stefan Seyfried
98548b6fa8 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


Origin commit data
------------------
Commit: 6a69be899d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2009-12-26 (Sat, 26 Dec 2009)
 2009-12-26 11:28:12 +00:00
mws
af96dd7fbd 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


Origin commit data
------------------
Commit: af888b3372
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-22 (Tue, 22 Dec 2009)

Origin message was:
------------------
 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
9aa4d164ca 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


Origin commit data
------------------
Commit: e57d1f7ed8
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-22 (Tue, 22 Dec 2009)
 2009-12-22 12:35:09 +00:00
mws
dac7e39a3a 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


Origin commit data
------------------
Commit: 5a7570a6ba
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-16 (Wed, 16 Dec 2009)
 2009-12-16 14:24:21 +00:00
mrcolor
cb8dd3394d our current experimental Neutrino branch 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: bc5bd4154e
Author: mrcolor <mrcolor@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-08 (Tue, 08 Dec 2009)
 2009-12-08 11:05:11 +00:00