Merge remote-tracking branch 'origin/master' into dev_aaron

Browse Source

...

This commit is contained in:

id101010

2015-06-07 17:02:47 +02:00

parent ce27acef98 f432236628

commit 7e3de6af80

8 changed files with 132 additions and 147 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

doc/docu.odt

Binary file not shown.

BIN

doc/docu.pdf

Binary file not shown.