nextcloud-desktop/src/gui/wizard
Daniel Molkentin 4fc044d368 Merge branch 'master' into move_lib_to_sep_dir
Conflicts:
	cmake/modules/NSIS.template.in
	src/CMakeLists.txt
	src/creds/shibboleth/authenticationdialog.cpp
	src/creds/shibboleth/authenticationdialog.h
	src/gui/owncloudgui.cpp
	src/libsync/creds/shibboleth/authenticationdialog.cpp
	src/libsync/creds/shibboleth/authenticationdialog.h
	src/libsync/mirallaccessmanager.cpp
	src/mirall/authenticationdialog.cpp
	src/mirall/authenticationdialog.h
2014-08-12 21:08:44 +02: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 Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
owncloudadvancedsetuppage.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
owncloudadvancedsetuppage.ui Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
owncloudhttpcredspage.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +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 Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02: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 'master' into move_lib_to_sep_dir 2014-08-12 21:08:44 +02:00
owncloudwizard.h Merge branch 'master' into move_lib_to_sep_dir 2014-08-12 21:08:44 +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 Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
owncloudwizardresultpage.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
owncloudwizardresultpage.ui Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00