Stefan Seyfried
|
25e6f0e820
|
replace __FILE__ with __file__
|
2016-01-10 19:34:31 +01:00 |
|
Stefan Seyfried
|
d244a5991a
|
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
|
2013-10-21 22:58:55 +02:00 |
|
Michael Liebmann
|
4ee8fded80
|
neutrino: Fit various functions to the changed at get_fs_usage()
|
2013-10-10 01:58:37 +02:00 |
|
Stefan Seyfried
|
32de6beef0
|
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
|
2013-09-01 19:46:10 +02:00 |
|
Michael Liebmann
|
9b12442b5d
|
Softupdate: Fix filename for local update
|
2013-08-21 06:32:10 +02:00 |
|
Michael Liebmann
|
bc069b0a84
|
Softupdate: Use user-defined file names
for apply settings and saving partitions from the flash.
|
2013-08-20 02:55:54 +02:00 |
|
Michael Liebmann
|
61d36266c8
|
src/gui/update_ext.cpp: Fix memleak (Thx SatBaby)
- rename enum's 'RESET_Fxx' => 'CLOSE_Fxx'
|
2013-07-20 10:21:29 +02:00 |
|
Stefan Seyfried
|
d5d5a60261
|
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
|
2013-06-16 21:22:14 +02:00 |
|
Michael Liebmann
|
c26fd64759
|
* 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
|
5ad0b6b6dc
|
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
|
2013-04-06 11:21:55 +02:00 |
|
Thilo Graf
|
0dc4686874
|
fix license text, sorry, was a c&p error
|
2013-03-21 11:37:00 +01:00 |
|
Stefan Seyfried
|
5b72a7fe3c
|
make the extupdate build conditional
extupdate is not very useful for most platforms, so only
build it if --enable-extupdate is passed to configure
|
2013-02-22 17:14:38 +01:00 |
|
satbaby
|
30436f353d
|
src/gui/update_ext.h: supplement to 9939fc9197
|
2013-01-16 12:03:40 +01:00 |
|
Thilo Graf
|
9939fc9197
|
extended update: move ext_update.* to update_ext.*
Beware the canonical order of filenames.
|
2013-01-14 15:31:43 +01:00 |
|