Branch: refs/heads/export_config
Home: https://github.com/yast/yast-installation
Commit: 9d3c116726e3c629e1ec8a1f3e475007c64ae6a8
https://github.com/yast/yast-installation/commit/9d3c116726e3c629e1ec8a1f3e4...
Author: Jiri Srain
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M src/clients/inst_complex_welcome.rb
Log Message:
-----------
adjusted according to Ken's comments
Commit: 3dd02e184561dba400b44d1845c21e794611b9f2
https://github.com/yast/yast-installation/commit/3dd02e184561dba400b44d1845c...
Author: Jiri Srain
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M package/yast2-installation.changes
M package/yast2-installation.spec
Log Message:
-----------
changelog
Conflicts:
package/yast2-installation.changes
Commit: 97b45a6e6e7078e3f2cc50ecc9d623d507571879
https://github.com/yast/yast-installation/commit/97b45a6e6e7078e3f2cc50ecc9d...
Author: Jiri Srain
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
A doc/features/examples/control.oem-image.xml.example
A doc/installation_clients.md
M package/yast2-installation.changes
M package/yast2-installation.spec
M src/Makefile.am
A src/clients/clone_finish.rb
A src/clients/clone_proposal.rb
M src/clients/inst_deploy_image.rb
A src/clients/inst_disk_for_image.rb
M src/clients/inst_finish.rb
M src/clients/inst_prepareprogress.rb
M src/clients/inst_proposal.rb
M src/clients/inst_system_analysis.rb
M src/clients/inst_worker_initial.rb
A src/lib/installation/clone_settings.rb
M src/modules/ImageInstallation.rb
M src/modules/InstData.rb
M startup/Makefile.am
Log Message:
-----------
Merge remote-tracking branch 'upstream/master'
Conflicts:
package/yast2-installation.changes
Commit: 72448f2e40cf20a6334f6a26f58c7f05a63fa68f
https://github.com/yast/yast-installation/commit/72448f2e40cf20a6334f6a26f58...
Author: Lukas Ocilka
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M package/yast2-installation.changes
M package/yast2-installation.spec
M src/clients/inst_complex_welcome.rb
Log Message:
-----------
Merge pull request #130 from jsrain/master
Adjusted dialog layout according to Ken's comment
Commit: 1022df59e215e2986458c5ff850e771d41a4a78d
https://github.com/yast/yast-installation/commit/1022df59e215e2986458c5ff850...
Author: Josef Reidinger
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M package/yast2-installation.changes
M package/yast2-installation.spec
M src/clients/inst_complex_welcome.rb
Log Message:
-----------
Merge branch 'master' of github.com:yast/yast-installation into export_config
Conflicts:
package/yast2-installation.changes
Compare: https://github.com/yast/yast-installation/compare/0d3effcb6e6f...1022df59e21...
