From 225d4e4573af23bff13970b5631345ee108f800b Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Mon, 4 May 2015 16:36:59 +0000
Subject: [PATCH] Redesigned the way vre description is shown to end users

git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/trunk/portlets/user/join-vre@114667 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .settings/org.eclipse.wst.common.component | 6 ++++++
 distro/changelog.xml                       | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 2ff775f..8814d39 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,6 +4,12 @@
     <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+<<<<<<< .mine
+        <dependent-module archiveName="gcube-widgets-1.9.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/gcube-widgets/gcube-widgets">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+=======
+>>>>>>> .r114666
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
         <property name="context-root" value="join-vre"/>
   </wb-module>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 0464c76..4c5d38d 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,8 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlet.user.joinvre.1-1-0"
+		date="2015-04-28">
+		<Change>Redesigned the way vre description is shown to end users</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlet.user.joinvre.1-0-0"
 		date="2015-03-02">
 		<Change>First Release</Change>