 Daniel Molkentin
|
a2b817f0c0
|
mirall.qrc -> client.qrc
|
2014-12-08 18:00:29 +01:00 |
|
|
Daniel Molkentin
|
d5f2c36abd
|
Mirall -> (Desktop) Client
|
2014-12-08 17:54:32 +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
|
cdac8d56d5
|
Merge remote-tracking branch 'origin/master' into crashreporter
Conflicts:
src/libsync/utility.cpp
src/libsync/utility.h
|
2014-11-11 23:53:38 +01:00 |
|
|
Daniel Molkentin
|
ae85aa33fd
|
Adjust namespaces
|
2014-11-09 22:34:07 +01:00 |
|
|
Christian Kamm
|
7ae0338f5c
|
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
|
2014-10-22 10:41:55 +02:00 |
|
|
Dominik Schmidt
|
1aca22b5f8
|
Make crash reporter executable branded
|
2014-08-30 10:46:09 +02:00 |
|
|
Dominik Schmidt
|
6abaad1ae8
|
Show crash reporter if trying to read the crash-reporter-enabled config crashes
|
2014-08-28 16:23:14 +02:00 |
|
|
Dominik Schmidt
|
89aec52503
|
Add checkbox to general settings to disable the crash reporter
|
2014-08-28 16:19:17 +02:00 |
|
|
Dominik Schmidt
|
439bf7641e
|
Use include path for libcrashreporter-qt instead of lengthy relative include
|
2014-08-28 11:11:42 +02:00 |
|
|
Dominik Schmidt
|
2b4849a2fa
|
Add crash reporter using libcrashreporter-qt
|
2014-08-26 18:15:13 +02:00 |
|
|
Daniel Molkentin
|
df3c3bca02
|
Split into three separate projects: library, gui and cmd
|
2014-07-11 11:07:31 +02:00 |
|