nextcloud-desktop/src/gui/wizard
Christian Kamm 4d7b8bdb25 Merge remote-tracking branch 'origin/1.7'
Conflicts:
	OWNCLOUD.cmake
	test/CMakeLists.txt
	test/testfolderwatcher.h
2014-11-19 14:45:25 +01:00
..
abstractcredswizardpage.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
abstractcredswizardpage.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
owncloudadvancedsetuppage.cpp Merge remote-tracking branch 'origin/1.7' 2014-11-06 19:54:20 +01:00
owncloudadvancedsetuppage.h Merge branch '1.7' 2014-08-29 20:40:33 +02:00
owncloudadvancedsetuppage.ui Merge branch '1.7' 2014-08-29 20:40:33 +02:00
owncloudhttpcredspage.cpp Merge branch '1.7' 2014-09-18 17:10:21 +02:00
owncloudhttpcredspage.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
owncloudhttpcredspage.ui Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
owncloudsetupnocredspage.ui Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
owncloudsetuppage.cpp Merge remote-tracking branch 'origin/1.7' 2014-11-19 14:45:25 +01:00
owncloudsetuppage.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
owncloudshibbolethcredspage.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
owncloudshibbolethcredspage.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
owncloudwizard.cpp Merge branch '1.7' 2014-09-18 17:10:21 +02:00
owncloudwizard.h Merge branch '1.7' 2014-08-29 20:40:33 +02:00
owncloudwizardcommon.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
owncloudwizardcommon.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
owncloudwizardresultpage.cpp Merge branch '1.7' 2014-08-29 20:40:33 +02:00
owncloudwizardresultpage.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
owncloudwizardresultpage.ui Merge branch '1.7' 2014-08-29 20:40:33 +02:00