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 "jbehave-osgi".
The branch, master has been updated
via 740bd71695117b83f46a60e193966f0386686b3a (commit)
via 6d4905ac555b06caed1290ee88cb76209aee8e03 (commit)
from 5a26592ba1434f96cf9339fd9dd6c891473fd748 (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 740bd71695117b83f46a60e193966f0386686b3a
Merge: 6d4905a 5a26592
Author: Cristiano GaviaÌo <[email protected]>
Date: Mon Feb 6 19:09:45 2012 -0300
Merge branch 'master' of github.com:jbehave/jbehave-osgi
Conflicts:
jbehave-osgi-examples/taskweb/org.jbehave.osgi.examples.taskweb.theme/META-INF/MANIFEST.MF
jbehave-osgi-examples/taskweb/org.jbehave.osgi.examples.taskweb.theme/build.properties
commit 6d4905ac555b06caed1290ee88cb76209aee8e03
Author: Cristiano GaviaÌo <[email protected]>
Date: Mon Feb 6 19:01:17 2012 -0300
added taskweb vaadin-osgi example.
-----------------------------------------------------------------------
Summary of changes:
.../META-INF/MANIFEST.MF | 28 +------------------
.../build.properties | 2 -
2 files changed, 2 insertions(+), 28 deletions(-)
hooks/post-receive
--
jbehave-osgi
<hr/>
<p>
To unsubscribe from this list please visit:
</p>
<p>
<a
href="http://xircles.codehaus.org/manage_email";>http://xircles.codehaus.org/manage_email</a>
</p>
