diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2013-08-14 17:17:58 +0400 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2013-08-14 17:19:21 +0400 |
| commit | 0589bfc51b167c5e58c1c163fcdeb6736632c6ff (patch) | |
| tree | 419e57776edfa51b3d8382fbb0e5e58a79768f3e /test/CMakeLists.txt | |
| parent | 04f32bd397c172d6c632712915c568b41dfb8ace (diff) | |
| parent | e89bdfc42271381cbb8dd9cdc1da4819886a6164 (diff) | |
Merge branch 'master' into propagator-ng
This just fix the conflict.
Do not compile or work yet
Conflicts:
src/CMakeLists.txt
src/mirall/csyncthread.cpp
src/mirall/csyncthread.h
src/mirall/owncloudfolder.cpp
src/mirall/syncfileitem.h
test/CMakeLists.txt
Diffstat (limited to 'test/CMakeLists.txt')
| -rw-r--r-- | test/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 327a61502..09aef2295 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -3,3 +3,4 @@ include_directories(${CSYNC_INCLUDE_DIR}/csync ${CSYNC_INCLUDE_DIR} ${CSYNC_INCL include(owncloud_add_test.cmake) owncloud_add_test(OwncloudPropagator) +owncloud_add_test(Utility) |