Daniel Molkentin 41d8d77535 Merge remote-tracking branch 'origin/2.1'

2016-02-10 12:57:03 +01:00

..

dolphin

Dolphin integration: use system icons for labels in KDE

2016-01-04 12:57:24 +01:00

icons

Windows: Update the overlay icon graphics #3105

2016-01-12 11:46:05 +01:00

MacOSX

OS X shell: Don't allow sharing sync roots #3505

2016-01-14 16:25:19 +01:00

nautilus

Merge remote-tracking branch 'origin/2.1'

2016-02-10 12:57:03 +01:00

windows

Windows shell: Remove unneeded Winsock code #4356

2016-01-14 15:02:56 +01:00

CMakeLists.txt

CMake: Fix typo

2015-11-30 01:05:18 +01:00