Commit Graph

159 Commits

Author SHA1 Message Date
max_10
76ba82ad88 TRIPLEDRAGON: deleted
Origin commit data
------------------
Branch: ni/coolstream
Commit: b4bab59f38
Author: max_10 <max_10@gmx.de>
Date: 2020-10-03 (Sat, 03 Oct 2020)

Origin message was:
------------------
- TRIPLEDRAGON: deleted

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2020-10-03 22:47:34 +02:00
Markus Volk
b6ac604c7a hdd_menu.cpp: improve test.
This is valid for all mmcblk devices


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9969437e35
Author: Markus Volk <f_l_k@t-online.de>
Date: 2020-02-16 (Sun, 16 Feb 2020)



------------------
This commit was generated by Migit
2020-02-17 20:34:50 +01:00
Markus Volk
152923db57 hdd_menu: fix -Wformat-truncation warnings it feels more sane to avoid possible truncation instead of just disarming the gcc test
Signed-off-by: Markus Volk <f_l_k@t-online.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: bf35565847
Author: Markus Volk <f_l_k@t-online.de>
Date: 2020-02-01 (Sat, 01 Feb 2020)



------------------
This commit was generated by Migit
2020-02-01 21:19:17 +01:00
Jacek Jendrzej
b29bfcf043 fix somme inits
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2d11995d1d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2020-01-18 (Sat, 18 Jan 2020)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2020-01-18 00:10:20 +01:00
Markus Volk
4c7e79db3c hdd_menu.cpp: circumvent format-truncation-warning
Signed-off-by: MarkusVolk <f_l_k@t-online.de>
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: dcc3e44437
Author: Markus Volk <f_l_k@t-online.de>
Date: 2020-01-09 (Thu, 09 Jan 2020)



------------------
This commit was generated by Migit
2020-01-09 21:37:16 +01:00
Markus Volk
1d84ede061 Revert "hdd_menu: avoid possible format-truncation errors"
This reverts commit b702c89fca036ca32f828dc9eb07922a231eb85a.

Signed-off-by: MarkusVolk <f_l_k@t-online.de>
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7754ca8e85
Author: Markus Volk <f_l_k@t-online.de>
Date: 2020-01-09 (Thu, 09 Jan 2020)



------------------
This commit was generated by Migit
2020-01-09 21:37:16 +01:00
Thilo Graf
9db4394adf hdd_menu: avoid possible format-truncation errors
Origin commit data
------------------
Branch: ni/coolstream
Commit: 01f8e5878b
Author: Thilo Graf <dbt@novatux.de>
Date: 2020-01-06 (Mon, 06 Jan 2020)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2020-01-06 22:25:46 +01:00
vanhofen
27b45a838a pick mipsbox code from DDT, TangoCash and max10
Origin commit data
------------------
Branch: ni/coolstream
Commit: f3f0bdaddb
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-05-03 (Fri, 03 May 2019)

Origin message was:
------------------
- pick mipsbox code from DDT, TangoCash and max10

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-05-03 22:50:45 +02:00
Frankenstone
ac8fc02909 hdd-menu: use mdev
Origin commit data
------------------
Branch: ni/coolstream
Commit: 04fa62bb73
Author: Frankenstone <dampf_acc@online.de>
Date: 2019-04-07 (Sun, 07 Apr 2019)

Origin message was:
------------------
- hdd-menu: use mdev

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-04-07 23:45:36 +02:00
Frankenstone
c79975ece3 hdd_menu.cpp: kill hdidle if hddsleep is active
Origin commit data
------------------
Branch: ni/coolstream
Commit: 58d2f99ba8
Author: Frankenstone <dampf_acc@online.de>
Date: 2019-01-20 (Sun, 20 Jan 2019)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-01-20 23:33:59 +01:00
vanhofen
d6bc79abe5 neutrino: create new neccessary user directories
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0387d4b159
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-18 (Tue, 18 Dec 2018)

Origin message was:
------------------
- neutrino: create new neccessary user directories

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-12-18 00:47:41 +01:00
Markus Volk
d92c678f32 hdd_menu.cpp: add support for sgdisk; fix sfdisk usage
- sfdisk is used primarily
- ensures detection of large hard drives
- using gpt tables with sfdisk or sgdisk

Note:
busybox fdisk doesn't support gpt tables and no large hard disks,
but fallback to old behavior should work unchanged
newer util versions of fdisk can do this but with different syntax.

Please test.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6448ba0d15
Author: Markus Volk <f_l_k@t-online.de>
Date: 2018-05-09 (Wed, 09 May 2018)



------------------
This commit was generated by Migit
2018-05-09 23:07:23 +02:00
vanhofen
897c43158c hdd_menu: use new marker icons
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0809b169e3
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-04 (Thu, 04 Jan 2018)

Origin message was:
------------------
- hdd_menu: use new marker icons

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-01-04 16:07:46 +01:00
vanhofen
bf2319a7cc hdd-menu: hide mmcblk devices from hdd-menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 41646df5e0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-07 (Sat, 07 Oct 2017)

Origin message was:
------------------
- hdd-menu: hide mmcblk devices from hdd-menu

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-07 20:52:38 +02:00
vanhofen
30b9dbb0b8 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c965d2408d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)



------------------
This commit was generated by Migit
2017-10-02 23:24:39 +02:00
vanhofen
0a0c8a13bf Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/hdd_menu.cpp
	src/gui/hdd_menu.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 73418490bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)



------------------
This commit was generated by Migit
2017-10-02 23:21:37 +02:00
vanhofen
463700033b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e8dd73320
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)



------------------
This commit was generated by Migit
2017-10-02 23:19:49 +02:00
Stefan Seyfried
ef71d00d7f remove "using namespace std" from header files
"using namespace std" in headers is considered bad practice, so move it
either into the respective cpp files or (for files which have lots of
other std::xxx usage anyway) just write it out explicitly.
Looking at the headers and the affected cpp files, one can actually see
why it is bad practice, as it's spreading very far ;-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d9139054a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)



------------------
This commit was generated by Migit
2017-10-02 13:43:57 +02:00
Stefan Seyfried
fb13a5533d remove "using namespace std" from header files
"using namespace std" in headers is considered bad practice, so move it
either into the respective cpp files or (for files which have lots of
other std::xxx usage anyway) just write it out explicitly.
Looking at the headers and the affected cpp files, one can actually see
why it is bad practice, as it's spreading very far ;-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: aa240a9457
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)



------------------
This commit was generated by Migit
2017-10-01 14:12:55 +02:00
Stefan Seyfried
df2178a9c0 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 189a4c62d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-01 13:08:15 +02:00
vanhofen
3df3b9eafe rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
Origin commit data
------------------
Branch: ni/coolstream
Commit: 99cc7f850a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)

Origin message was:
------------------
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-29 10:34:23 +02:00
vanhofen
c75a12894f Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/gui/bookmarkmanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 537ea51fcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)



------------------
This commit was generated by Migit
2017-09-29 08:35:05 +02:00
vanhofen
369436124b rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
Origin commit data
------------------
Branch: ni/coolstream
Commit: ebc621f3b2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)

Origin message was:
------------------
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-29 08:27:42 +02:00
vanhofen
d6bf987c5e Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d2c54a405b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-28 (Thu, 28 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-28 23:43:36 +02:00
vanhofen
1e1394fb56 several memleak fixes; Dziekuje.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f9cb1dc50
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-28 (Thu, 28 Sep 2017)

Origin message was:
------------------
- several memleak fixes; Dziekuje.

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-28 15:23:38 +02:00
vanhofen
c5d81a62c4 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6488fbf13a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)



------------------
This commit was generated by Migit
2017-09-07 16:41:06 +02:00
gixxpunk
b74c372d6e fix name/path of mdev mount script in neutrino
Origin commit data
------------------
Branch: ni/coolstream
Commit: 812ef87119
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-09-06 (Wed, 06 Sep 2017)

Origin message was:
------------------
- fix name/path of mdev mount script in neutrino

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-06 17:25:18 +02:00
Stefan Seyfried
f889b88c73 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: d1f5ea76a0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-26 (Sat, 26 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-26 12:58:44 +02:00
vanhofen
5a43934c6b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 17546e7ba1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-10 (Sat, 10 Jun 2017)



------------------
This commit was generated by Migit
2017-06-10 11:43:50 +02:00
gixxpunk
deb3770a66 hdd_menu.cpp: remove "-T largefile" parameter
Some users experience problems with too low amount of inodes (No space
left on device but only a few percent of the device are actually used).
To fix this, simply use default settings. This will give us a much
higher amount of inodes on the hard drive but will waste a bit more
space on the device for inode reservation.

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 327dbbed1e
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)



------------------
This commit was generated by Migit
2017-06-07 14:17:11 +02:00
gixxpunk
2f13c2e157 hdd_menu.cpp: remove "-T largefile" parameter
Some users experience problems with too low amount of inodes (No space
left on device but only a few percent of the device are actually used).
To fix this, simply use default settings. This will give us a much
higher amount of inodes on the hard drive but will waste a bit more
space on the device for inode reservation.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a522037a1
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-30 (Tue, 30 May 2017)



------------------
This commit was generated by Migit
2017-05-30 16:22:41 +02:00
vanhofen
afda007d95 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/Makefile.am
	src/gui/imageinfo_ni.cpp
	src/gui/movieplayer.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b934995ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
2017-02-12 22:17:17 +01:00
vanhofen
b9b5808928 NI-code: Rename hardware defined macros for coolstream stb
Origin commit data
------------------
Branch: ni/coolstream
Commit: f02c3dc1db
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
- NI-code: Rename hardware defined macros for coolstream stb

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-12 21:57:06 +01:00
Stefan Seyfried
94d677b18c Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b47699447
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-11 (Sat, 11 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-11 11:18:45 +01:00
vanhofen
c80102a917 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	src/driver/Makefile.am
	src/driver/framebuffer.h
	src/gui/bookmarkmanager.cpp
	src/gui/filebrowser.cpp
	src/gui/widget/buttons.cpp
	src/system/httptool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: dd6244f33e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)



------------------
This commit was generated by Migit
2017-02-09 13:19:03 +01:00
vanhofen
3451ef6f9f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: dae3c55d4d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-06 23:21:45 +01:00
vanhofen
e18792ffbb hdd_menu: fix c/p error
Origin commit data
------------------
Branch: ni/coolstream
Commit: aed22b3788
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)

Origin message was:
------------------
- hdd_menu: fix c/p error

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-06 23:21:01 +01:00
vanhofen
9aaeb66d92 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5e69fd2b22
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-06 21:17:40 +01:00
vanhofen
b7ea9d2338 hdd_menu: fix hd-idle/hdparm logic; fix small memleaks
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0411359866
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)

Origin message was:
------------------
- hdd_menu: fix hd-idle/hdparm logic; fix small memleaks

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-06 21:09:42 +01:00
Stefan Seyfried
776aea7c95 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: c6d7968381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-12-04 18:02:51 +01:00
vanhofen
6b0e887585 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)



------------------
This commit was generated by Migit
2016-11-21 12:46:49 +01:00
vanhofen
4af96e1b6d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d065c1f394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-21 00:14:20 +01:00
Thilo Graf
b69a99f74c CHDDMenuHandler: simplify and fix hintbox calls
Hints were not closed after lost scope. Explicit hide() is required.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 74473d0ebe
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)



------------------
This commit was generated by Migit
2016-11-20 22:49:07 +01:00
vanhofen
a413bfb40d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/lua/lua_misc.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)



------------------
This commit was generated by Migit
2016-11-19 21:11:54 +01:00
Thilo Graf
36d8d81fa6 CMsgBox: rework msgbox classes with Window class implementation
Replacing messagebox, hintbox_ext and some derivated parts with
basic class hintbox and derivated class CMsgBox. This should unify
window handling and avoids maintain of multiple classes with quasi
same purpose and adds more functionality.

TODO: fix and optimize details


Origin commit data
------------------
Branch: ni/coolstream
Commit: dde298b1b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-04 (Mon, 04 Apr 2016)



------------------
This commit was generated by Migit
2016-10-24 10:31:24 +02:00
Stefan Seyfried
3f75ef5f47 Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-22 11:37:40 +02:00
vanhofen
af8fe3ebc6 Merge branch 'ni/mp' into ni/cst-next
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)



------------------
This commit was generated by Migit
2016-08-26 19:13:47 +02:00
Michael Liebmann
2c4ccf9555 Merge branch 'cst-next' into nmp-cst-next
- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit
2016-08-19 17:40:48 +02:00
vanhofen
22158b9e17 move FLAGDIR definition to global.h; ...
... use CTouchFileNotifier to handle .hddpower flagfile


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0cdacc196e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-25 (Wed, 25 May 2016)

Origin message was:
------------------
- move FLAGDIR definition to global.h; ...

... use CTouchFileNotifier to handle .hddpower flagfile


------------------
This commit was generated by Migit
2016-05-25 23:15:37 +02:00
vanhofen
fb01ee52e2 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: d8170ad6cf
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-21 (Sat, 21 May 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-05-21 21:47:22 +02:00