7 commits

Author	SHA1	Message	Date
Olivier Goffart	28a66cb393	SettingsDialogMac: adapt to multi-account	2015-05-26 17:37:15 +02:00
Olivier Goffart	de9770f52a	FolderMan: fix some signal-slot broken connection ... In many cases the alias was changed to a Folder pointer	2015-05-12 15:50:38 +02:00
Daniel Molkentin	3016844dd7	Merge branch 'master' into rename_client ... Conflicts: README.md src/gui/folderman.cpp src/gui/settingsdialog.cpp src/libsync/accessmanager.cpp src/libsync/propagateupload.h	2014-12-02 13:37:22 +01:00
Daniel Molkentin	714599aeaa	Refactor generic settings dialog ... - move items on top like on Mac OS (right is free for accounts now) - The account icon no longer reflects the current status (in prep for multi-account)	2014-12-01 11:37:06 +01:00
Daniel Molkentin	ae85aa33fd	Adjust namespaces	2014-11-09 22:34:07 +01:00
Daniel Molkentin	f25d175b5d	Merge remote-tracking branch 'origin/1.7'	2014-11-06 19:54:20 +01:00
Daniel Molkentin	df3c3bca02	Split into three separate projects: library, gui and cmd	2014-07-11 11:07:31 +02:00

Renamed from src/mirall/settingsdialogmac.h (Browse further)