[yast-commit] [yast/yast-yast2] e29f3d: Merge remote-tracking branch 'origin/SLE-12-GA' in...

Branch: refs/heads/merge_SLE12 Home: https://github.com/yast/yast-yast2 Commit: e29f3d9b12ff9579ddcd5e8151edaf4c0fc42ff8 https://github.com/yast/yast-yast2/commit/e29f3d9b12ff9579ddcd5e8151edaf4c0f... Author: Ladislav Slezák Date: 2015-08-20 (Thu, 20 Aug 2015) Changed paths: M package/yast2.changes M scripts/yast2 Log Message: ----------- Merge remote-tracking branch 'origin/SLE-12-GA' into merge_SLE12 Conflicts: package/yast2.changes package/yast2.spec Commit: ac4d9198f68b245b6d607820156fa60dcd5b4e8f https://github.com/yast/yast-yast2/commit/ac4d9198f68b245b6d607820156fa60dcd... Author: Ladislav Slezák Date: 2015-08-20 (Thu, 20 Aug 2015) Changed paths: M package/yast2.changes M package/yast2.spec Log Message: ----------- 3.1.147 Compare: https://github.com/yast/yast-yast2/compare/e29f3d9b12ff^...ac4d9198f68b