Daniel Poetzl c16d75b5f6 merge fixes		2017-04-03 16:57:59 +01:00
..
all_properties1	Remove trailing whitespace from all lines	2016-11-29 09:58:36 +00:00
all_properties2	Remove trailing whitespace from all lines	2016-11-29 09:58:36 +00:00
stop_on_fail1	Remove trailing whitespace from all lines	2016-11-29 09:58:36 +00:00
Makefile	merge fixes	2017-04-03 16:57:59 +01:00