Revert "Merged master into gtk3, fixed three conflicts."

This reverts commit c857bba95e.
This commit is contained in:
Beep6581
2016-06-09 23:24:55 +02:00
parent bd1a7fc4a7
commit 3da7d84ba9
50 changed files with 5937 additions and 6037 deletions

File diff suppressed because it is too large Load Diff