Files
recycled-ni-neutrino/src/gui/components
vanhofen cc7ad7ce1a 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
------------------
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)
2016-11-19 21:11:54 +01:00
..
2016-10-10 14:19:54 +02:00
2016-10-10 14:19:54 +02:00
2016-10-10 14:19:54 +02:00
2016-10-10 14:19:55 +02:00
2016-10-24 10:31:25 +02:00
2016-10-10 14:19:54 +02:00
2016-10-24 10:31:25 +02:00