Daniel Molkentin
|
3016844dd7
|
Merge branch 'master' into rename_client
Conflicts:
README.md
src/gui/folderman.cpp
src/gui/settingsdialog.cpp
src/libsync/accessmanager.cpp
src/libsync/propagateupload.h
|
2014-12-02 13:37:22 +01:00 |
|
Olivier Goffart
|
512492bf30
|
Merge remote-tracking branch 'origin/1.7'
Conflicts:
src/libsync/propagatedownload.cpp
|
2014-12-01 14:37:47 +01:00 |
|
Daniel Molkentin
|
2db17a57d2
|
Fix header names
|
2014-11-09 23:25:57 +01:00 |
|
Daniel Molkentin
|
ae85aa33fd
|
Adjust namespaces
|
2014-11-09 22:34:07 +01:00 |
|
Daniel Molkentin
|
f2eadacf09
|
Remove "Mirall" from class names
|
2014-11-09 22:30:29 +01:00 |
|
Daniel Molkentin
|
df3c3bca02
|
Split into three separate projects: library, gui and cmd
|
2014-07-11 11:07:31 +02:00 |
|