Stephan Sundermann 009f80e024 Merge remote-tracking branch 'remotes/upstream/develop' into webcam ...

Conflicts:
	Output/Languages/Deutsch.xml
	Output/Languages/English.xml
Merged conflicts automatically

2012-12-08 12:25:59 +01:00

..

Deutsch.xml

Merge remote-tracking branch 'remotes/upstream/develop' into webcam

2012-12-08 12:25:59 +01:00

English.xml

Merge remote-tracking branch 'remotes/upstream/develop' into webcam

2012-12-08 12:25:59 +01:00

French.xml

added missing text translation

2012-08-12 15:09:18 +02:00

Spanish.xml

added missing text translation

2012-08-12 15:09:18 +02:00