Merge branch 'master' into develop

Browse Source

Conflicts:
	.gitmodules

...

This commit is contained in:

Enno Rehling 2015-08-04 10:50:43 +02:00

parent 2288b8fb27 57bb4a49f1

commit 00d8994918

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

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

Diff Content Not Available