Merge branch 'master' into gtk3

This commit is contained in:
Morgan Hardwood
2016-08-24 21:38:27 +02:00
12 changed files with 1584 additions and 1316 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff