diff options
| author | Klaas Freitag <freitag@owncloud.com> | 2014-08-29 22:23:07 +0400 |
|---|---|---|
| committer | Klaas Freitag <freitag@owncloud.com> | 2014-08-29 22:23:07 +0400 |
| commit | 7ce2a93c63e4e01b5777bc1f854ebfb1047afb98 (patch) | |
| tree | 7c61477a6a7ad01c31e72fc6d2113862b438265c /src/CMakeLists.txt | |
| parent | 4d33773cef1752f26b941d2ed31240f7089e8fdc (diff) | |
| parent | e17243bc1fd5d774a3a4d4d59c0a621f907edecd (diff) | |
Merge remote-tracking branch 'origin/reuse_oc_config' into 1.7
Conflicts:
src/CMakeLists.txt
src/mirall/folderman.cpp
src/mirall/folderman.h
src/mirall/owncloudtheme.h
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 652637765..6727e17dd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -270,6 +270,7 @@ set(mirall_SRCS mirall/sslbutton.cpp mirall/syncrunfilelog.cpp mirall/selectivesyncdialog.cpp + mirall/accountmigrator.cpp ) |