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, master has been updated
via 7a1581d5ee8a958a72be8582c1e9b8bb277f37a0 (commit)
via efbd6d2c77b625eeb7026b02de9476c3a206f645 (commit)
via 72d55721fb51c2db79009142ede317f0842f7286 (commit)
from 3be63195d02e646235166a003b53bd256b0cf39f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7a1581d5ee8a958a72be8582c1e9b8bb277f37a0
Merge: efbd6d2 3be6319
Author: Martin Fluegge <[email protected]>
Date: Sun Oct 30 13:01:15 2011 +0100
merge remote-tracking branch 'origin/master'
Conflicts:
plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/DawnRuntimePlugin.java
commit efbd6d2c77b625eeb7026b02de9476c3a206f645
Author: Martin Fluegge <[email protected]>
Date: Sun Oct 30 12:28:36 2011 +0100
clean up
commit 72d55721fb51c2db79009142ede317f0842f7286
Author: Martin Fluegge <[email protected]>
Date: Sun Oct 30 12:28:09 2011 +0100
clean up
-----------------------------------------------------------------------
Summary of changes:
.../eclipse/emf/cdo/dawn/DawnRuntimePlugin.java | 5 -
.../cdo/dawn/actions/HandleConflictsAction.java | 178 ++++++++++----------
2 files changed, 87 insertions(+), 96 deletions(-)
hooks/post-receive
--
CDO Model Repository
_______________________________________________
cdo-commit mailing list
[email protected]
http://dev.eclipse.org/mailman/listinfo/cdo-commit
