[yast-commit] [yast/yast-country] 97e667: Merge remote-tracking branch 'origin/remove_spec_i...
Branch: refs/heads/ci_integration Home: https://github.com/yast/yast-country Commit: 97e66775cc42e53c17918d4078de36c70ff63887 https://github.com/yast/yast-country/commit/97e66775cc42e53c17918d4078de36c7... Author: Josef Reidinger <jreidinger@suse.cz> Date: 2013-10-02 (Wed, 02 Oct 2013) Changed paths: M .gitignore M VERSION M package/yast2-country.changes A package/yast2-country.spec R yast2-country.spec.in Log Message: ----------- Merge remote-tracking branch 'origin/remove_spec_in' into ci_integration Conflicts: VERSION package/yast2-country.changes Commit: f164e6e65f47b5723c9b9dca9f430b685f0a91e4 https://github.com/yast/yast-country/commit/f164e6e65f47b5723c9b9dca9f430b68... Author: Josef Reidinger <jreidinger@suse.cz> Date: 2013-10-02 (Wed, 02 Oct 2013) Changed paths: A Rakefile Log Message: ----------- Add rakefile Commit: 8b91749aa7dcd30bd351d30f38f6ee0f12ff6734 https://github.com/yast/yast-country/commit/8b91749aa7dcd30bd351d30f38f6ee0f... Author: Josef Reidinger <jreidinger@suse.cz> Date: 2013-10-02 (Wed, 02 Oct 2013) Changed paths: M package/yast2-country.spec Log Message: ----------- remove non-existing file Compare: https://github.com/yast/yast-country/compare/97e66775cc42^...8b91749aa7dc
participants (1)
-
GitHub