Stefan Seyfried
6830b68cac
Merge branch 'check/next-cc'
...
again: it compiles, but is not really tested...
Conflicts:
acinclude.m4
src/driver/volume.cpp
src/gui/infoviewer.cpp
src/gui/osd_setup.cpp
src/gui/start_wizard.cpp
src/zapit/src/getservices.cpp
Origin commit data
------------------
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-07-06 (Sat, 06 Jul 2013)
2013-07-06 19:01:15 +02:00
[CST] Focus
a2db4efdfd
system/flashtool.cpp: prevent crash on invalid mtdData access,
...
ie pos = -1 if system-fs not found;
change sysfs name on apollo
Origin commit data
------------------
Commit: be05be5069
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-06-18 (Tue, 18 Jun 2013)
2013-06-18 16:23:51 +04:00
Stefan Seyfried
fce4dbbe72
Merge branch 'check/next-cc'
...
it compiles, but is not really tested...
Conflicts:
src/driver/netfile.cpp
src/driver/volume.cpp
src/eitd/sectionsd.cpp
src/gui/audioplayer.cpp
src/gui/bedit/bouqueteditor_bouquets.cpp
src/gui/bedit/bouqueteditor_channels.cpp
src/gui/bookmarkmanager.cpp
src/gui/bouquetlist.cpp
src/gui/eventlist.cpp
src/gui/movieplayer.cpp
src/gui/pictureviewer.cpp
src/gui/scan.cpp
src/gui/test_menu.h
src/gui/timerlist.cpp
src/gui/update.cpp
src/gui/widget/listbox.cpp
src/neutrino.cpp
src/system/flashtool.cpp
src/zapit/src/Makefile.am
src/zapit/src/femanager.cpp
Origin commit data
------------------
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-06-16 (Sun, 16 Jun 2013)
2013-06-16 21:22:14 +02:00
Michael Liebmann
67903dfd93
Software update: Copy flashimage to /tmp if it is not present in this directory
...
- unmount mounted network folders before flashing
- kill timerd before flashing
Origin commit data
------------------
Commit: c780676ce5
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2013-06-12 (Wed, 12 Jun 2013)
2013-06-13 01:36:03 +02:00
Michael Liebmann
4987f7ef5b
Software update: Rework preparing the flash process
...
- Finish all unnecessary threads and processes before the flash process
- Use flash.start to stop other (user-defined) processes
Origin commit data
------------------
Commit: c26fd64759
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2013-06-08 (Sat, 08 Jun 2013)
Origin message was:
------------------
* Software update: Rework preparing the flash process
- Finish all unnecessary threads and processes before the flash process
- Use flash.start to stop other (user-defined) processes
2013-06-08 16:20:32 +02:00
[CST] Focus
499d23e6a6
Merge branch 'next' into next-cc
...
Conflicts:
data/locale/english.locale
src/driver/framebuffer.cpp
src/gui/channellist.cpp
src/gui/eventlist.cpp
src/gui/moviebrowser.cpp
Origin commit data
------------------
Commit: 6f8ef9ec46
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-06-02 (Sun, 02 Jun 2013)
2013-06-02 10:46:42 +04:00
Jacek Jendrzej
3df0492743
CFlashTool::erase - shutdown sectionsd before erase flash
...
Origin commit data
------------------
Commit: 412d430ed0
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2013-06-01 (Sat, 01 Jun 2013)
2013-06-01 15:04:46 +02:00
[CST] Focus
35cea9b651
system/flashtool.cpp: use buffer on stack
...
Origin commit data
------------------
Commit: 3959771c18
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-05-21 (Tue, 21 May 2013)
2013-05-21 16:54:17 +04:00
Stefan Seyfried
b83199d097
flashtool: fix build on Tripledragon
...
Origin commit data
------------------
Commit: 8047f65815
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-05-11 (Sat, 11 May 2013)
2013-05-11 17:05:22 +02:00
[CST] Focus
ba3ac836bc
system/flashtool.cpp: fix buffer size for nor
...
Origin commit data
------------------
Commit: d1cbff900f
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-01-29 (Tue, 29 Jan 2013)
2013-01-29 17:38:39 +04:00
[CST] Focus
beef75007f
system/flashtool.cpp: add bad block skip for read/write/erase in case of NAND
...
Origin commit data
------------------
Commit: e739868e7c
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-01-29 (Tue, 29 Jan 2013)
2013-01-29 14:23:50 +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
[CST] Focus
88a92f9948
remove obsolete and unused includes
...
Origin commit data
------------------
Commit: 35ee04049a
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2012-06-14 (Thu, 14 Jun 2012)
2012-06-14 11:01:37 +04:00
Jacek Jendrzej
d9a2730470
fix Wextra compil
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@770 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 15c474a6d8
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2010-09-14 (Tue, 14 Sep 2010)
Origin message was:
------------------
fix Wextra compil
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@770 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-09-14 17:13:29 +00:00
[CST] Focus
22ccd26a23
Update menu changes; setup wizard banner
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@634 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: c3897d3231
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2010-06-19 (Sat, 19 Jun 2010)
2010-06-19 09:55:21 +00:00
[CST] Focus
32df7aa21e
Search mtd device to update by name
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@581 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: d133701c83
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2010-05-12 (Wed, 12 May 2010)
2010-05-12 12:10:12 +00:00
Jacek Jendrzej
548f91e373
fix possible Resource leak
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@249 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: f06a3982ef
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2010-02-01 (Mon, 01 Feb 2010)
2010-02-01 22:21:32 +00:00
mws
0ed8ac5577
fix initializers and shadows
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@124 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 474790557f
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-29 (Tue, 29 Dec 2009)
2009-12-29 13:56:52 +00:00
Stefan Seyfried
38644a8f3f
fix more "type qualifiers ignored on function return type" warnings
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@105 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 732ffb18be
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2009-12-21 (Mon, 21 Dec 2009)
2009-12-21 17:26:15 +00:00
mws
c62aa94983
Mark unused vars as comment
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@104 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 1b13da2617
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-21 (Mon, 21 Dec 2009)
2009-12-21 16:23:09 +00:00
mws
086fa4a601
comment in unused variables,
...
replace #warning statements
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@60 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 9bcbe03475
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-16 (Wed, 16 Dec 2009)
2009-12-16 15:34:26 +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