This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CDO Model Repository".
The branch, committers/estepper/merger-2 has been created
at 38ddb33c40630f799efa9fb3af1d1a3754e9201f (commit)
- Log -----------------------------------------------------------------
commit 38ddb33c40630f799efa9fb3af1d1a3754e9201f
Merge: cf6c29f b0ce750
Author: Eike Stepper <[email protected]>
Date: Sat Apr 20 08:25:26 2013 +0200
Merge branch 'master' into committers/estepper/merger-2
Conflicts:
plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionData.java
plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORevisionDeltaImpl.java
plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/AbstractCDORevision.java
plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src/templates/EMFFragmentTemplate.xpt
plugins/org.eclipse.emf.cdo.ui/plugin.properties
plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.java
plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/DefaultCDOMerger.java
commit cf6c29f8a8c059c6b8d9d8449700b5c807641c87
Author: Eike Stepper <[email protected]>
Date: Sun Mar 17 10:18:34 2013 +0100
[396804] CDOMergingConflictResolver tests
https://bugs.eclipse.org/bugs/show_bug.cgi?id=396804
commit 1b69ce45f7ee434081c356355c8bf55faa07bfc7
Author: Eike Stepper <[email protected]>
Date: Sat Feb 9 09:23:53 2013 +0100
Fix line endings
commit 64e0847c1f533a77c4b1e5ebeeff6861bb362dbd
Author: Eike Stepper <[email protected]>
Date: Sat Feb 9 09:23:28 2013 +0100
[396804] CDOMergingConflictResolver tests
https://bugs.eclipse.org/bugs/show_bug.cgi?id=396804
commit 6dcfc7f2c3d82bf7c8131c6664e7ec0ec3d7a2dc
Author: Eike Stepper <[email protected]>
Date: Sat Feb 9 07:55:44 2013 +0100
[396804] CDOMergingConflictResolver tests
https://bugs.eclipse.org/bugs/show_bug.cgi?id=396804
commit c4502038ee09b24ff4300c24cc3c2ade8ee95f2b
Author: Eike Stepper <[email protected]>
Date: Fri Feb 8 07:52:51 2013 +0100
[396804] CDOMergingConflictResolver tests
https://bugs.eclipse.org/bugs/show_bug.cgi?id=396804
commit d1480f21d9c9d5e583734e0b1cf94684f8f19c7e
Author: Eike Stepper <[email protected]>
Date: Wed Feb 6 07:54:59 2013 +0100
Fix line endings
-----------------------------------------------------------------------
hooks/post-receive
--
CDO Model Repository
_______________________________________________
cdo-commit mailing list
[email protected]
http://dev.eclipse.org/mailman/listinfo/cdo-commit
