Olivier Goffart
|
ad92e7b888
|
Move UploadDevice to the right header
|
2014-11-14 16:40:13 +01:00 |
|
Daniel Molkentin
|
281c0e1553
|
Merge branch 'master' into rename_client
Conflicts:
CMakeLists.txt
src/gui/main.cpp
src/libsync/accessmanager.cpp
src/libsync/accessmanager.h
src/libsync/owncloudpropagator_p.h
|
2014-11-12 00:07:59 +01:00 |
|
Daniel Molkentin
|
ae85aa33fd
|
Adjust namespaces
|
2014-11-09 22:34:07 +01:00 |
|
Olivier Goffart
|
de11f602d5
|
Merge remote-tracking branch 'origin/il'
Conflicts:
csync/src/csync_private.h
src/CMakeLists.txt
src/gui/folder.cpp
src/libsync/owncloudpropagator.cpp
src/libsync/owncloudpropagator.h
src/libsync/propagator_qnam.cpp
src/libsync/propagator_qnam.h
src/libsync/syncengine.cpp
src/libsync/syncengine.h
src/mirall/syncjournaldb.cpp
|
2014-11-08 10:48:36 +01:00 |
|
Olivier Goffart
|
50e718b1e7
|
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
|
2014-09-18 17:10:21 +02:00 |
|
Daniel Molkentin
|
df3c3bca02
|
Split into three separate projects: library, gui and cmd
|
2014-07-11 11:07:31 +02:00 |
|