diff options
| author | Christian Kamm <kamm@incasoftware.de> | 2014-10-22 12:20:38 +0400 |
|---|---|---|
| committer | Christian Kamm <kamm@incasoftware.de> | 2014-10-22 12:41:55 +0400 |
| commit | 7ae0338f5c210c59211f33a0148dc55a6b88cd95 (patch) | |
| tree | 512779d0b1a911abbcb8d5ef89b536193663044c /test/CMakeLists.txt | |
| parent | b2460fbee2f2fedfa785d55b963f096627ea0af6 (diff) | |
| parent | 8dc3f2146a865f6cd35029ee5f0d072c129582ef (diff) | |
Merge remote-tracking branch 'origin/1.7'
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/socketapi.h
src/libsync/syncengine.h
test/CMakeLists.txt
Diffstat (limited to 'test/CMakeLists.txt')
| -rw-r--r-- | test/CMakeLists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 64b182f2d..deab96227 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -27,5 +27,4 @@ endif(UNIX AND NOT APPLE) owncloud_add_test(CSyncSqlite "") owncloud_add_test(NetrcParser ../src/cmd/netrcparser.cpp) - - +owncloud_add_test(OwnSql ../src/libsync/ownsql.cpp) |