Stefan Seyfried
50380667ec
replace __FILE__ with __file__
...
Origin commit data
------------------
Commit: 25e6f0e820seife@tuxbox-git.slipkontur.de >
Date: 2016-01-10 (Sun, 10 Jan 2016)
2016-01-10 19:34:31 +01:00
Stefan Seyfried
e6cbfe61bc
Merge branch 'check/next-cc'
...
Compiles on most platforms, starts. Not really tested.
Conflicts:
acinclude.m4
lib/libdvbsub/Makefile.am
lib/libtriple/Makefile.am
lib/libtuxtxt/Makefile.am
src/Makefile.am
src/create_rcsim_h.sh
src/daemonc/Makefile.am
src/driver/Makefile.am
src/driver/audiodec/Makefile.am
src/driver/pictureviewer/Makefile.am
src/eitd/Makefile.am
src/gui/Makefile.am
src/gui/bouquetlist.cpp
src/gui/channellist.cpp
src/gui/scan_setup.cpp
src/gui/streaminfo2.cpp
src/gui/streaminfo2.h
src/gui/update.cpp
src/gui/widget/Makefile.am
src/gui/widget/listbox.cpp
src/neutrino.cpp
src/nhttpd/tuxboxapi/coolstream/Makefile.am
src/rcsim.c
src/system/Makefile.am
src/zapit/src/Makefile.am
src/zapit/src/frontend.cpp
src/zapit/src/zapit.cpp
Origin commit data
------------------
Commit: d244a5991aseife@tuxbox-git.slipkontur.de >
Date: 2013-10-21 (Mon, 21 Oct 2013)
2013-10-21 22:58:55 +02:00
Michael Liebmann
04451904b4
neutrino: Fit various functions to the changed at get_fs_usage()
...
Origin commit data
------------------
Commit: 4ee8fded80tuxcode.bbg@gmail.com >
Date: 2013-10-08 (Tue, 08 Oct 2013)
2013-10-10 01:58:37 +02:00
Stefan Seyfried
2c76238007
Merge remote-tracking branch 'check/next-cc'
...
needs buildfixing...
Conflicts:
src/eitd/sectionsd.cpp
src/gui/audioplayer.cpp
src/gui/bedit/bouqueteditor_channels.cpp
src/gui/infoclock.cpp
src/gui/infoviewer.cpp
src/gui/motorcontrol.cpp
src/gui/osd_setup.cpp
src/gui/scan.cpp
src/gui/scan_setup.cpp
src/gui/streaminfo2.cpp
src/gui/update.cpp
src/gui/widget/progresswindow.cpp
src/gui/widget/textbox.cpp
src/neutrino.cpp
src/zapit/include/zapit/femanager.h
Origin commit data
------------------
Commit: 32de6beef0seife@tuxbox-git.slipkontur.de >
Date: 2013-09-01 (Sun, 01 Sep 2013)
2013-09-01 19:46:10 +02:00
Michael Liebmann
b77b1a38bd
Softupdate: Fix filename for local update
...
Origin commit data
------------------
Commit: 9b12442b5dtuxcode.bbg@gmail.com >
Date: 2013-08-20 (Tue, 20 Aug 2013)
2013-08-21 06:32:10 +02:00
Michael Liebmann
36b3fd0a99
Softupdate: Use user-defined file names
...
for apply settings and saving partitions from the flash.
Origin commit data
------------------
Commit: bc069b0a84tuxcode.bbg@gmail.com >
Date: 2013-08-08 (Thu, 08 Aug 2013)
2013-08-20 02:55:54 +02:00
Michael Liebmann
762193a714
src/gui/update_ext.cpp: Fix memleak (Thx SatBaby)
...
- rename enum's 'RESET_Fxx' => 'CLOSE_Fxx'
Origin commit data
------------------
Commit: 61d36266c8tuxcode.bbg@gmail.com >
Date: 2013-07-19 (Fri, 19 Jul 2013)
2013-07-20 10:21:29 +02: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: d5d5a60261seife@tuxbox-git.slipkontur.de >
Date: 2013-06-16 (Sun, 16 Jun 2013)
2013-06-16 21:22:14 +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: c26fd64759tuxcode.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
Stefan Seyfried
f1e664b75e
Merge branch 'check/pu-cc' into master
...
needs buildfixing...
Conflicts:
data/Makefile.am
src/driver/framebuffer.h
src/driver/volume.cpp
src/gui/bedit/bouqueteditor_bouquets.cpp
src/gui/bedit/bouqueteditor_channels.cpp
src/gui/bouquetlist.cpp
src/gui/channellist.cpp
src/gui/filebrowser.cpp
src/gui/imageinfo.cpp
src/gui/infoviewer.cpp
src/gui/streaminfo2.cpp
src/gui/widget/textbox.cpp
Origin commit data
------------------
Commit: 5ad0b6b6dcseife@tuxbox-git.slipkontur.de >
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 11:21:55 +02:00
Thilo Graf
0e9ff3d23c
fix license text, sorry, was a c&p error
...
Origin commit data
------------------
Commit: 0dc4686874dbt@novatux.de >
Date: 2013-03-20 (Wed, 20 Mar 2013)
2013-03-21 11:37:00 +01:00
Stefan Seyfried
1684f2481d
make the extupdate build conditional
...
extupdate is not very useful for most platforms, so only
build it if --enable-extupdate is passed to configure
Origin commit data
------------------
Commit: 5b72a7fe3cseife@tuxbox-git.slipkontur.de >
Date: 2013-02-22 (Fri, 22 Feb 2013)
2013-02-22 17:14:38 +01:00
Jacek Jendrzej
4f6334d208
src/gui/update_ext.h: supplement to daf4a68e5e
...
Origin commit data
------------------
Commit: 30436f353doverx300@gmail.com >
Date: 2013-01-16 (Wed, 16 Jan 2013)
2013-01-16 12:03:40 +01:00
Thilo Graf
daf4a68e5e
extended update: move ext_update.* to update_ext.*
...
Beware the canonical order of filenames.
Origin commit data
------------------
Commit: 9939fc9197dbt@novatux.de >
Date: 2013-01-13 (Sun, 13 Jan 2013)
2013-01-14 15:31:43 +01:00
