Merge branch 'maint' into master

Browse Source

Handle conflict between version number reset and lowercasing all commands

...

This commit is contained in:

Geert Janssens

2018-05-04 10:25:38 +02:00

parent 6be7e82b9f 85c7f7d1cb

commit 52ac539d23

168 changed files with 3684 additions and 2566 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

1022

CMakeLists.txt

File diff suppressed because it is too large Load Diff