Commit Graph

7 Commits

Author SHA1 Message Date
Stefan Seyfried
2e9fbd20ed neutrino: fix most hardcoded paths
Conflicts:
	src/eitd/SIlanguage.cpp
	src/eitd/SIlanguage.hpp
	src/gui/bookmarkmanager.h
	src/gui/keybind_setup.cpp
	src/gui/settings_manager.cpp
	src/nhttpd/yconfig.h
	src/nhttpd/yhttpd_mods/Makefile.am
	src/system/localize.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 166e403965
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)



------------------
This commit was generated by Migit
2013-03-12 17:16:13 +04:00
[CST] Bas
b3f96076ae neutrino: fix file location.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1babe68529
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-01-28 (Mon, 28 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-29 01:20:55 +08:00
[CST] Bas
1e3dcd7e9a neutrino: fix file locations. use the predetermined CONFIGDIR instead of hardcoding paths.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8dfa226920
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-01-25 (Fri, 25 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-25 10:33:40 +08:00
[CST] Bas
dcb46bbbe1 Merge branch 'dvbsi++' of c00lstreamtech.de:cst-private-neutrino into includecleanup
Conflicts:
	src/eitd/SIlanguage.cpp
	src/eitd/SIsections.cpp
	src/eitd/dmx.cpp
	src/eitd/dmxapi.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: ce9eb10ed0
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-03-08 (Thu, 08 Mar 2012)



------------------
This commit was generated by Migit
2012-03-08 12:17:03 +08:00
[CST] Focus
551ce93cfc eitd: unify copyright header
Origin commit data
------------------
Branch: ni/coolstream
Commit: 02d748eca9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-07 (Wed, 07 Mar 2012)


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

------------------
This commit was generated by Migit
2012-03-07 16:43:57 +04:00
[CST] Bas
25f3c22886 eitd: Fix files according to the new includes branch.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 96e7c51cff
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-03-06 (Tue, 06 Mar 2012)


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

------------------
This commit was generated by Migit
2012-03-06 14:50:02 +08:00
[CST] Focus
155885a4d2 Copy sectionsd code to new eitd directory, to cleanup and leave original code for reference
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ea0c375ea
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-01 (Wed, 01 Feb 2012)


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

------------------
This commit was generated by Migit
2012-02-01 16:09:49 +04:00