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 "The saros eclipse plugin.".
The branch, master has been updated
via 3867f737ae7a606b92319489144c6940799ae3b3 (commit)
via 9e27550344fedcdadf30a219d3e653a85d1eeacf (commit)
via a8caf1d9fe5ed7d95860de9a39c1ec36a0571aa2 (commit)
via 7addcdba15c22225a7bc74636c03f113fc13fda8 (commit)
via 194b5936f1b72aedf3aea6bf04a3201e1fdd8eaa (commit)
via 36240ee8ca56845b6c852bcf072fd4f43d4da9df (commit)
via cb2149bc832070e69a12fb0f34e82c863ff7d5bf (commit)
from 26f2ff7190f0eb1e693f2c7736ef6abdd80dc6d4 (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 3867f737ae7a606b92319489144c6940799ae3b3
Merge: 26f2ff7 9e27550
Author: Franz Zieris <[email protected]>
Date: Tue Jul 17 15:58:22 2012 +0200
[BUILD] Merge branch 'release/12.7.6'
Conflicts:
de.fu_berlin.inf.dpp.whiteboard/META-INF/MANIFEST.MF
de.fu_berlin.inf.dpp/META-INF/MANIFEST.MF
de.fu_berlin.inf.nebula/META-INF/MANIFEST.MF
Change-Id: I0da9c6fc27316227cf6637c942fe71fe7e5cf83d
-----------------------------------------------------------------------
Summary of changes:
de.fu_berlin.inf.dpp.feature/feature.xml | 8 +-
de.fu_berlin.inf.dpp.update/site.xml | 6 ++
de.fu_berlin.inf.dpp/CHANGELOG | 24 +++++
.../dpp/communication/muc/session/MUCSession.java | 3 +-
.../dpp/invitation/IncomingProjectNegotiation.java | 9 +-
.../inf/dpp/preferences/PreferenceConstants.java | 2 +-
.../inf/dpp/preferences/PreferenceInitializer.java | 2 +-
.../dpp/ui/widgets/session/ChatRoomsComposite.java | 93 ++++++++++++++++++++
.../dpp/ui/wizards/pages/EnterProjectNamePage.java | 4 +-
.../de/fu_berlin/inf/dpp/util/VersionManager.java | 7 ++
10 files changed, 145 insertions(+), 13 deletions(-)
hooks/post-receive
--
The saros eclipse plugin.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Dpp-robot mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dpp-robot
