diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2014-09-18 19:08:53 +0400 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2014-09-18 19:10:21 +0400 |
| commit | 50e718b1e7a9c6119c6e52f58353ec76f3c1b908 (patch) | |
| tree | 25108be71930b0c43a2c850d0ed44674bc3824cf /test/CMakeLists.txt | |
| parent | c3d41f0d48bdb00b9e5d1b5c9be37d896a089da1 (diff) | |
| parent | fc36e7eccf132eb0cda76ee41b2db85376d42c86 (diff) | |
Merge branch '1.7'
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/folder.cpp
src/gui/socketapi.cpp
translations/mirall_ca.ts
translations/mirall_cs.ts
translations/mirall_de.ts
translations/mirall_el.ts
translations/mirall_en.ts
translations/mirall_es.ts
translations/mirall_es_AR.ts
translations/mirall_et.ts
translations/mirall_eu.ts
translations/mirall_fa.ts
translations/mirall_fi.ts
translations/mirall_fr.ts
translations/mirall_gl.ts
translations/mirall_hu.ts
translations/mirall_it.ts
translations/mirall_ja.ts
translations/mirall_nl.ts
translations/mirall_pl.ts
translations/mirall_pt.ts
translations/mirall_pt_BR.ts
translations/mirall_ru.ts
translations/mirall_sk.ts
translations/mirall_sl.ts
translations/mirall_sv.ts
translations/mirall_th.ts
translations/mirall_tr.ts
translations/mirall_uk.ts
translations/mirall_zh_CN.ts
translations/mirall_zh_TW.ts
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 597fb2e31..8c1ae5c93 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -26,5 +26,6 @@ if( UNIX AND NOT APPLE ) endif(UNIX AND NOT APPLE) owncloud_add_test(CSyncSqlite "") +owncloud_add_test(NetrcParser ../src/owncloudcmd/netrcparser.cpp) |