merged trunk changes

This commit is contained in:
Markus Fröschle
2013-05-12 06:30:17 +00:00
parent a180851b50
commit 91f2dc9a16
16 changed files with 800 additions and 60 deletions

View File

@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8