mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 17:01:08 +02:00
Code Issues Packages Projects Releases Wiki Activity
10,915 Commits 2 Branches 9 Tags
d9fc0a4a98e2de36830d43b51fcace243b71befe
Commit Graph

210 Commits

Author SHA1 Message Date
Stefan Seyfried
0222346c9a Merge remote-tracking branch 'uncool/cst-next' 
Origin commit data
------------------
Commit: 9113716171
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-01 (Fri, 01 Jan 2016)
 2016-01-01 14:10:48 +01:00
Stefan Seyfried
4fad676f6d define LUA_COMPAT_5_2 to allow build with newer lua versions 
Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com>


Origin commit data
------------------
Commit: dbad3b069a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
 2015-12-31 11:44:04 +01:00
Stefan Seyfried
17880c4125 Merge remote-tracking branch 'uncool/cst-next' 
This need buildfixes and some functional updates...


Origin commit data
------------------
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
 2015-12-13 17:41:55 +01:00
Stefan Seyfried
14b9082d1b define LUA_COMPAT_5_2 to allow build with newer lua versions 
Origin commit data
------------------
Commit: 565e5ff3ff
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
 2015-12-13 13:56:56 +01:00
Michael Liebmann
6cef9d09fb CLuaInstance: Move luainstance into a separate directory (src/gui/lua) 
- Move video functions from luainstance.cpp to lua_video.cpp
 - For the future, provided the individual classes
 (eg menu, CComponents etc.) to move in separate files.


Origin commit data
------------------
Commit: 464f929437
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-12-08 (Tue, 08 Dec 2015)

Origin message was:
------------------
CLuaInstance: Move luainstance into a separate directory (src/gui/lua)

 - Move video functions from luainstance.cpp to lua_video.cpp
 - For the future, provided the individual classes
  (eg menu, CComponents etc.) to move in separate files.
 2015-12-08 12:01:25 +01:00
Jacek Jendrzej
c5e24e6410 eitd: add and move viasat to extra switch 
Origin commit data
------------------
Commit: fceeab4027
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-08-09 (Sun, 09 Aug 2015)
 2015-08-09 18:00:13 +02:00
Jacek Jendrzej
519b645c1d audioplayer: -add flv format (THX Houdini) 
Origin commit data
------------------
Commit: 29aa47aef0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-07-27 (Mon, 27 Jul 2015)
 2015-07-27 12:40:41 +02:00
FlatTV
e90d1aebcc add lib/jsoncpp v0.10.2 
use amalgamated source and header based on version 0.10.2
 See: https://github.com/open-source-parsers/jsoncpp/blob/master/README.md


Origin commit data
------------------
Commit: 76e26c0b98
Author: FlatTV <FlatTV@gmx.de>
Date: 2015-06-01 (Mon, 01 Jun 2015)

Origin message was:
------------------
- add lib/jsoncpp v0.10.2

 use amalgamated source and header based on version 0.10.2
 See: https://github.com/open-source-parsers/jsoncpp/blob/master/README.md
 2015-06-01 12:36:15 +02:00
vanhofen
e22449fb3f src/nhttpd/tuxboxapi: remove unused dbox code 
Origin commit data
------------------
Commit: e59f8adccc
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-06 (Wed, 06 May 2015)

Origin message was:
------------------
- src/nhttpd/tuxboxapi: remove unused dbox code
 2015-05-06 22:59:04 +02:00
Jacek Jendrzej
787fc5ebda add pugixml 
Origin commit data
------------------
Commit: 422c91d117
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-04-27 (Mon, 27 Apr 2015)
 2015-04-28 10:12:23 +02:00
Stefan Seyfried
98fe56c38b Merge remote-tracking branch 'test/cst-next' 
Origin commit data
------------------
Commit: 92fcc879b4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-03-07 (Sat, 07 Mar 2015)
 2015-03-07 20:09:44 +01:00
vanhofen
35bae7820a yWeb: hopefully the last fix for f0ad744 
Origin commit data
------------------
Commit: b1b45f6029
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-03-01 (Sun, 01 Mar 2015)

Origin message was:
------------------
- yWeb: hopefully the last fix for f0ad744
 2015-03-01 21:31:28 +01:00
Stefan Seyfried
36d861cd26 configure: define SCREENSHOT in config.h 
defining it in video.h does not work as it is not
included everywhere where the define is needed


Origin commit data
------------------
Commit: dfdd1976e9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-25 (Wed, 25 Feb 2015)
 2015-02-25 21:13:05 +01:00
Stefan Seyfried
557c5e4302 use the correct include path to the private headers 
...and make sure they are actally used everywhere
This is the correct fix for 118fd7e8ac


Origin commit data
------------------
Commit: 35c331de69
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-28 (Wed, 28 Jan 2015)
 2015-01-28 20:53:58 +01:00
Stefan Seyfried
dba9605cd0 make sure the private dvb headers are used on coolstream 
Origin commit data
------------------
Commit: bcc38b9b4d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-27 (Tue, 27 Jan 2015)
 2015-01-27 21:22:29 +01:00
Stefan Seyfried
7cd2ffd7bd make curl and freetype2 detection crosscompile-friendly 
Origin commit data
------------------
Commit: 69a8e455af
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)
 2015-01-26 13:52:56 +01:00
Stefan Seyfried
ec1a9fce17 Merge remote-tracking branch 'check/cst-next' 
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
 2014-12-25 18:03:08 +01:00
martii
f0bcb0fa4d lua: implement "luaclient". 
This allows for starting Lua scripts in neutrino context from the
command line. Experimental, not fully regression-tested.


Origin commit data
------------------
Commit: 5d25185684
Author: martii <m4rtii@gmx.de>
Date: 2014-10-13 (Mon, 13 Oct 2014)
 2014-10-14 10:27:37 +02:00
Thilo Graf
2dbbd10ce7 configure: move option enable testmenu to enable testing 
Testing is also plausible for general usage of other tests or other
experimental code parts.


Origin commit data
------------------
Commit: 201a6aa56e
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-09-19 (Fri, 19 Sep 2014)
 2014-09-25 11:01:17 +04:00
Thilo Graf
303e0e88e8 configure: add libsigc++ support 
Origin commit data
------------------
Commit: 6e126bd74d
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-07-29 (Tue, 29 Jul 2014)
 2014-09-25 10:58:13 +04:00
[CST] Bas
307a1bab7f split fec to fec/modulation/delivery system; 
switch to new dvb-api headers;
improve dvb-t manual scan


Origin commit data
------------------
Commit: 17d1bbd12b
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)
 2014-08-27 17:14:33 +04:00
Stefan Seyfried
eedb5b86ce configure: only require libbluray on coolstream 
Origin commit data
------------------
Commit: 6a35e27642
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
 2014-04-27 19:25:22 +02:00
Stefan Seyfried
3f36062fe7 Merge remote-tracking branch 'check/next-cc' 
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
 2014-04-27 19:14:06 +02:00
Thilo Graf
afb44fe375 configure: add libbluray support into configure 
It may happen that the build process aborts if this lib is not
expilzit specified, although this lib is not used directly
by neutrino.
It seems to be dependent of build environment, and should be understand
as a prevention.


Origin commit data
------------------
Commit: f2bfa22159
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-02-23 (Sun, 23 Feb 2014)
 2014-03-03 08:54:09 +01:00
Stefan Seyfried
be735f6a31 lua: detect if static or dynamic linking is wanted 
Origin commit data
------------------
Commit: 899837e003
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-26 (Sun, 26 Jan 2014)
 2014-01-26 01:25:06 +01:00
gixxpunk
84577152ea rewrite Lua handling 
* depend pkg checks on enable-lua switch
* define STATIC_LUAPOSIX in case of static lua build to exclude unwanted
code in neutrino
* remove DYNAMIC_LUAPOSIX code as it's not needed in case of dynamic lua
build


Origin commit data
------------------
Commit: 4b6d2d310c
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2014-01-25 (Sat, 25 Jan 2014)

Origin message was:
------------------
- rewrite Lua handling

* depend pkg checks on enable-lua switch
* define STATIC_LUAPOSIX in case of static lua build to exclude unwanted
code in neutrino
* remove DYNAMIC_LUAPOSIX code as it's not needed in case of dynamic lua
build
 2014-01-25 21:17:06 +01:00
Stefan Seyfried
e05d1def44 Revert "Add a --enable-lua switch to enable LUA support" 
This reverts commit 2056b4ed80.

This just makes the code unreadable and why would one build
without lua :-)


Origin commit data
------------------
Commit: 5525e9f4b5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)
 2014-01-23 14:11:03 +01:00
Stefan Seyfried
a112e8fb49 Merge remote-tracking branch 'check/next-cc' 
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp


Origin commit data
------------------
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)
 2014-01-23 14:08:37 +01:00
Michael Liebmann
2056b4ed80 Add a --enable-lua switch to enable LUA support 
Origin commit data
------------------
Commit: 82d4832013
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-21 (Tue, 21 Jan 2014)
 2014-01-21 17:05:24 +01:00
Stefan Seyfried
ad9a584052 configure: try to autodetect lualib 
Origin commit data
------------------
Commit: 966c7f1379
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-27 (Mon, 27 May 2013)
 2014-01-19 20:57:37 +01:00
Stefan Seyfried
8d876ff4ef Merge remote-tracking branch 'check/next-cc' 
untested, probably needs some buildfixing


Origin commit data
------------------
Commit: 7d87ce9c54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)
 2013-12-22 21:25:05 +01:00
[CST] Focus
e86e6a4b23 configure.ac: add --enable-ffmpegdec option to switch between old decoders and ffmpeg decoder 
Origin commit data
------------------
Commit: 64e2a0c2ad
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-15 (Sun, 15 Dec 2013)
 2013-12-15 14:46:45 +04:00
martii
a8f5b925e9 driver/audiodec: Switch to ffmpeg, drop custom decoder implementations, drop libvorbis/libmad/libid3/libogg/libflac. Not fully regression tested. 
Conflicts:
	configure.ac
	src/Makefile.am
	src/driver/audiodec/Makefile.am


Origin commit data
------------------
Commit: d5ea074457
Author: martii <m4rtii@gmx.de>
Date: 2013-10-19 (Sat, 19 Oct 2013)
 2013-12-15 14:40:53 +04:00
Stefan Seyfried
53d485c333 configure: put buildinfo stuff in own config header 
...so there's no need to rebuild everything all the time


Origin commit data
------------------
Commit: 06f233b288
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
 2013-11-13 14:34:18 +01:00
Stefan Seyfried
261ea85af6 Merge branch 'check/next-cc' 
Only compile-tested.


Origin commit data
------------------
Commit: 548448456a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
 2013-11-13 14:04:15 +01:00
Stefan Seyfried
abe49faabb fix cleantargets 
Origin commit data
------------------
Commit: f04bfbdd88
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
 2013-11-13 10:38:42 +01:00
Stefan Seyfried
4d7f78c8a0 Makefiles: simplify includes for libcoolstream/libstb-hal 
Origin commit data
------------------
Commit: 3a728f9ee1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-11 (Mon, 11 Nov 2013)
 2013-11-11 21:51:08 +01:00
Michael Liebmann
92dd88d98d Add display of build info 
- Display compiler version, compiler flags, build PC, kernel version
- configure.ac part ported from filezilla project


Origin commit data
------------------
Commit: 4cf4857201
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-17 (Thu, 17 Oct 2013)
 2013-11-11 00:20:09 +01:00
Stefan Seyfried
107ca7babc fix cleantargets 
Origin commit data
------------------
Commit: 7fbbcbe9a4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
 2013-11-10 19:47:44 +01:00
Stefan Seyfried
80b809a370 Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.


Origin commit data
------------------
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
 2013-11-10 16:55:53 +01:00
Thilo Graf
adf19708da CTestMenu: add configure option --enable-testmenu 
Origin commit data
------------------
Commit: 6f700d80c0
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-04 (Mon, 04 Nov 2013)
 2013-11-05 13:22:28 +01:00
Stefan Seyfried
446ce560d1 fix build when --with-stb-hal-build is given 
Origin commit data
------------------
Commit: 756080ba19
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-03 (Sun, 03 Nov 2013)
 2013-11-03 12:20:58 +01:00
Stefan Seyfried
93071bc9d2 allow empty --with-stb-hal-build path 
Origin commit data
------------------
Commit: 6f174c2c26
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-03 (Sun, 03 Nov 2013)
 2013-11-03 02:09:32 +01:00
[CST] Focus
897e889f43 add libiw to build 
Origin commit data
------------------
Commit: 7f01a5740d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-01 (Fri, 01 Nov 2013)
 2013-11-01 16:43:06 +04: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: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)
 2013-10-21 22:58:55 +02:00
Michael Liebmann
9e3b8e79bf src/system/mtdutils: Add and patch makefiles 
Origin commit data
------------------
Commit: 2299807e11
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-01 (Sun, 01 Sep 2013)
 2013-09-27 06:44:34 +02:00
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
d09745a48f add initial Astra 19e settings to install 
Origin commit data
------------------
Commit: 33bc58915a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-28 (Fri, 28 Jun 2013)
 2013-06-28 16:12:33 +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
ed0c31f657 Software update: Add flash.start to neutrino start/stop scripts 
Origin commit data
------------------
Commit: d74ce0da45
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-08 (Sat, 08 Jun 2013)

Origin message was:
------------------
* Software update: Add flash.start to neutrino start/stop scripts
 2013-06-08 16:20:32 +02:00