Files
recycled-ni-neutrino/data
vanhofen f1c4db23e3 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 29b6f4a827
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-16 (Tue, 16 Aug 2016)



------------------
This commit was generated by Migit
2016-08-16 15:45:22 +02:00
..
2016-08-02 15:07:42 +02:00
2016-05-19 22:59:54 +02:00
2015-01-02 18:58:46 +01:00
2016-05-19 22:59:54 +02:00
2016-05-19 22:59:54 +02:00
2016-05-19 22:59:54 +02:00
2016-05-19 22:59:54 +02:00
2013-08-08 15:51:47 +02:00
2016-05-19 22:59:54 +02:00
2016-05-10 14:00:37 +02:00
2016-05-19 22:59:54 +02:00
2016-05-19 22:59:54 +02:00
2014-02-28 13:44:22 +04:00
2016-05-19 22:59:54 +02:00
2016-05-19 22:59:54 +02:00