[CST] Focus 6042fb95d8 Merge branch 'next' of coolstreamtech.de:cst-public-gui-neutrino into next ...

Conflicts:
	lib/libconfigfile/configfile.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: aa60c85768
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-07 (Thu, 07 Mar 2013)



------------------
This commit was generated by Migit

2013-03-07 17:10:57 +04:00

..

configfile.cpp

Merge branch 'next' of coolstreamtech.de:cst-public-gui-neutrino into next

2013-03-07 17:10:57 +04:00

configfile.h

nhttpd add some new configfile handling

2010-04-12 05:32:20 +00:00

Makefile.am

our current experimental Neutrino branch

2009-12-08 11:05:11 +00:00