Stefan Seyfried
a112e8fb49
Merge remote-tracking branch 'check/next-cc'
...
compiles, nothing else.
Conflicts:
configure.ac
src/Makefile.am
src/gui/Makefile.am
src/gui/luainstance.cpp
src/gui/luainstance.h
src/gui/plugins.cpp
src/gui/plugins.h
src/gui/scan_setup.cpp
src/gui/start_wizard.cpp
src/gui/test_menu.cpp
src/gui/user_menue.cpp
src/gui/widget/hintboxext.cpp
src/gui/widget/menue.cpp
src/gui/widget/messagebox.cpp
src/gui/widget/stringinput.cpp
Origin commit data
------------------
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-23 (Thu, 23 Jan 2014)
2014-01-23 14:08:37 +01:00
vanhofen
8d5aa84e20
adapt ShowMsg handling from martii's neutrino-mp
...
Origin commit data
------------------
Commit: 53f5801d6f
Author: vanhofen <vanhofen@gmx.de >
Date: 2014-01-22 (Wed, 22 Jan 2014)
Origin message was:
------------------
- adapt ShowMsg handling from martii's neutrino-mp
2014-01-22 12:37:21 +01:00
vanhofen
82168342a2
Revert "- add missing include of vfd header"
...
This reverts commit 81d56f75fc
.
Origin commit data
------------------
Commit: 014dd3ac7b
Author: vanhofen <vanhofen@gmx.de >
Date: 2013-11-13 (Wed, 13 Nov 2013)
2013-11-13 23:39:55 +01:00
vanhofen
81d56f75fc
add missing include of vfd header
...
Origin commit data
------------------
Commit: 3845feb0e4
Author: vanhofen <vanhofen@gmx.de >
Date: 2013-11-13 (Wed, 13 Nov 2013)
Origin message was:
------------------
- add missing include of vfd header
2013-11-13 10:40:18 +01:00
Stefan Seyfried
748b384771
neutrino: explicitly include vfd/lcd header
...
Instead of including it everywhere through global.h, just include
the lcd/vfd header where needed. Add a tiny helper header "display.h"
to divert between vfd.h (coolstream) and lcdd.h (everything else).
Origin commit data
------------------
Commit: 6b72095f5a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-05-11 (Sat, 11 May 2013)
2013-05-11 17:17:33 +02:00
Jacek Jendrzej
0456a04ded
rc_lock: lock for rc_lock, use only once, supplement to 5bc50d70d8
...
Origin commit data
------------------
Commit: 9a2d6aea26
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2012-10-22 (Mon, 22 Oct 2012)
Origin message was:
------------------
rc_lock: lock for rc_lock, use only once, supplement to 5bc50d70d8
2012-10-22 15:52:07 +02:00
Jacek Jendrzej
b75a14126a
fix warnings
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@303 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 9f87f97094
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2010-02-08 (Mon, 08 Feb 2010)
Origin message was:
------------------
-fix warnings
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@303 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-02-08 11:23:09 +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