Merge branch 'devel' into bigbreak

Browse Source

Conflicts:
	readme.md

...

This commit is contained in:

Araq

2014-10-21 22:22:25 +02:00

parent c95e0df29d 95595d86a9

commit ddf9c375b8

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

Diff Content Not Available