4 Commits

Autor	SHA1	Mensagem	Data
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
Christian Kamm	f275002ebe	Merge branch '1.7'	2014-11-20 12:41:06 +01:00
Daniel Molkentin	ae85aa33fd	Adjust namespaces	2014-11-09 22:34:07 +01:00
Daniel Molkentin	df3c3bca02	Split into three separate projects: library, gui and cmd	2014-07-11 11:07:31 +02:00