7 commits

Author	SHA1	Message	Date
Daniel Molkentin	cdac8d56d5	Merge remote-tracking branch 'origin/master' into crashreporter ... Conflicts: src/libsync/utility.cpp src/libsync/utility.h	2014-11-11 23:53:38 +01:00
Tim Vandecasteele	f3cc614427	Fix apple build. ... The apple build was broken because the elseif in the CMakeLists is never triggered. Some code was not properly adapted for the new qtmacgoodies. Some paths were not adapted to new split.	2014-09-12 14:24:26 +02:00
Dominik Schmidt	2b4849a2fa	Add crash reporter using libcrashreporter-qt	2014-08-26 18:15:13 +02:00
Markus Goetz	faa502163e	OS X: Finally(?) fix stay-on-top behaviour of settings dialog ... Fixes #1795	2014-08-12 14:48:42 +02:00
Daniel Molkentin	084d9de4c9	Add binary submodule	2014-08-06 09:28:18 +02:00
Denis Dzyubenko	a51cb0982b	Added Mac-specific settings dialog that looks more native	2014-02-18 02:22:16 +01:00
Daniel Molkentin	9a0096d07c	Docs: Allow to build with org and com branding	2013-09-02 14:01:15 +02:00