Branch: refs/heads/fix_conflicts Home: https://github.com/yast/yast-ldap Commit: 6110353295df6394d07a667f9eafbf77e3d7c825 https://github.com/yast/yast-ldap/commit/6110353295df6394d07a667f9eafbf77e3d... Author: Peter Varkoly <varkoly@suse.de> Date: 2014-01-31 (Fri, 31 Jan 2014) Changed paths: M package/yast2-ldap.changes M package/yast2-ldap.spec M src/Ldap.rb Log Message: ----------- Include included routines. Commit: 12bbfb3e2e3b4c97f4c5eec94b6bf35c3b5e47e8 https://github.com/yast/yast-ldap/commit/12bbfb3e2e3b4c97f4c5eec94b6bf35c3b5... Author: Peter Varkoly <varkoly@suse.de> Date: 2014-01-31 (Fri, 31 Jan 2014) Changed paths: M package/yast2-ldap.changes Log Message: ----------- Fix typo Commit: ba257698498c2822d8e8d9487f8ce860ff772334 https://github.com/yast/yast-ldap/commit/ba257698498c2822d8e8d9487f8ce860ff7... Author: Josef Reidinger <jreidinger@suse.cz> Date: 2014-02-04 (Tue, 04 Feb 2014) Changed paths: M package/yast2-ldap.changes M package/yast2-ldap.spec M src/Ldap.rb Log Message: ----------- Merge pull request #8 from varkoly/master Include routines from routines.rb into Ldap.rb Commit: 52a2993b24576f126d900c9ba09b4c2da6460681 https://github.com/yast/yast-ldap/commit/52a2993b24576f126d900c9ba09b4c2da64... Author: Josef Reidinger <jreidinger@suse.cz> Date: 2014-02-04 (Tue, 04 Feb 2014) Changed paths: M package/yast2-ldap.changes M package/yast2-ldap.spec M src/Ldap.rb Log Message: ----------- Merge branch 'master' of github.com:yast/yast-ldap into fix_conflicts Conflicts: package/yast2-ldap.changes Compare: https://github.com/yast/yast-ldap/compare/e92843397f20...52a2993b2457