Daniel Molkentin
|
0735aa1fbd
|
Structure developer documentation
- rename target "doc-dev"
- group into modules
- move to doc/dev
|
2015-06-29 18:43:21 +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 |
|
Olivier Goffart
|
78362af168
|
Compile with TOKEN_AUTH_ONLY
(QtGui is not included in that case)
|
2014-11-21 12:15:41 +01:00 |
|
Daniel Molkentin
|
ae85aa33fd
|
Adjust namespaces
|
2014-11-09 22:34:07 +01:00 |
|
Klaas Freitag
|
bcff1ced5e
|
Merge branch '1.7'
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/folderman.cpp
src/gui/wizard/owncloudadvancedsetuppage.cpp
src/libsync/account.cpp
|
2014-08-29 20:40:33 +02:00 |
|
Daniel Molkentin
|
902bb7a198
|
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
Conflicts:
src/CMakeLists.txt
src/gui/accountsettings.cpp
src/gui/folderwizard.cpp
src/gui/settingsdialog.cpp
src/libsync/syncengine.h
|
2014-08-26 11:29:42 +02:00 |
|
Daniel Molkentin
|
df3c3bca02
|
Split into three separate projects: library, gui and cmd
|
2014-07-11 11:07:31 +02:00 |
|