Branch: refs/heads/master Home: https://github.com/yast/yast-yast2 Commit: 1df38db579669138bbcbb2f1c98dd1559b91e6bf https://github.com/yast/yast-yast2/commit/1df38db579669138bbcbb2f1c98dd1559b... Author: Jiri Srain <jsrain@suse.cz> Date: 2014-05-02 (Fri, 02 May 2014) Changed paths: M library/packages/src/modules/SlideShow.rb M package/yast2.changes Log Message: ----------- fixed incorrect function name (bnc#876105) Commit: 915883d71546f2cc11c7336015181d789ea34c8d https://github.com/yast/yast-yast2/commit/915883d71546f2cc11c7336015181d789e... Author: Jiri Srain <jsrain@suse.cz> Date: 2014-05-02 (Fri, 02 May 2014) Changed paths: M library/cwm/src/modules/DialogTree.rb M library/cwm/src/modules/TablePopup.rb M library/general/src/modules/Hooks.rb M library/network/src/modules/NetworkService.rb M library/packages/src/modules/Product.rb M library/packages/src/modules/SlideShow.rb A library/packages/test/data/zypp/products.yml M library/packages/test/product_test.rb M library/runlevel/src/modules/Service.rb M library/systemd/src/lib/yast2/systemd_unit.rb M library/systemd/src/modules/systemd_service.rb M library/systemd/test/systemd_service_test.rb M library/systemd/test/systemd_unit_test.rb M library/types/src/Makefile.am R library/types/src/modules/URLRecode.pm A library/types/src/modules/URLRecode.rb M package/yast2.changes M package/yast2.spec M scripts/save_y2logs Log Message: ----------- Merge remote-tracking branch 'upstream/master' Conflicts: package/yast2.changes Commit: 6a8e4f887014864b02f706a9f96aaeb9bad4c008 https://github.com/yast/yast-yast2/commit/6a8e4f887014864b02f706a9f96aaeb9ba... Author: Jiri Srain <jsrain@suse.cz> Date: 2014-05-02 (Fri, 02 May 2014) Changed paths: M package/yast2.changes M package/yast2.spec Log Message: ----------- bump Commit: 1826b12648861e248ef03f7e8f44d2514d864c95 https://github.com/yast/yast-yast2/commit/1826b12648861e248ef03f7e8f44d2514d... Author: Jiří Šrain <jsrain@suse.cz> Date: 2014-05-02 (Fri, 02 May 2014) Changed paths: M library/packages/src/modules/SlideShow.rb M package/yast2.changes M package/yast2.spec Log Message: ----------- Merge pull request #238 from jsrain/master fixed incorrect function name (bnc#876105) Compare: https://github.com/yast/yast-yast2/compare/1f853ad6ae3d...1826b1264886