Merge branch 'stable-0.x'

Browse Source

Empty merge done with "-s ours". To avoid
branch renames to propagate to master source code.

...

This commit is contained in:

Radovan Bast

2016-05-20 11:22:59 +02:00

parent b7c2e4947f 512f1d3877

commit 61ad3d7359

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