nextcloud-desktop/src
Olivier Goffart 29fecb029e Merge remote-tracking branch 'origin/1.8'
Conflicts:
	VERSION.cmake
        src/gui/accountsettings.cpp
	src/gui/accountsettings.h
2015-06-25 12:30:52 +02:00
..
3rdparty Fix compilation with Qt 5.5 2015-04-19 11:02:43 +02:00
cmd Merge branch 'master' into new-ui 2015-06-10 15:57:55 +02:00
crashreporter Fix a crash in the crash reporter on OSX 2015-03-06 19:28:53 +01:00
gui Merge remote-tracking branch 'origin/1.8' 2015-06-25 12:30:52 +02:00
libsync Merge remote-tracking branch 'origin/1.8' 2015-06-25 12:30:52 +02:00
mirall Bump to 1.9 2015-05-06 17:01:05 +02:00
CMakeLists.txt Merge remote-tracking branch 'origin/master' into crashreporter 2014-11-11 23:53:38 +01:00