From: František Dvořák <valtri@civ.zcu.cz>
Date: Thu, 3 Mar 2011 17:29:30 +0000 (+0000)
Subject: Revert to the proper version, fix the merge.
X-Git-Tag: glite-jobid-api-java_R_1_1_2_1~10
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=019e12bc414c0703a9ee3ff65aa4e22c5532daa0;p=jra1mw.git

Revert to the proper version, fix the merge.
---

diff --git a/org.glite.lbjp-common.gsoap-plugin/project/ChangeLog b/org.glite.lbjp-common.gsoap-plugin/project/ChangeLog
index 2f8f25f..c619850 100644
--- a/org.glite.lbjp-common.gsoap-plugin/project/ChangeLog
+++ b/org.glite.lbjp-common.gsoap-plugin/project/ChangeLog
@@ -50,15 +50,15 @@
 2.1.3-2
 - Module rebuilt
 
+2.1.4-1
+- Threaded gsoap-plugin linked with gsoap, too.
+
 3.0.0-1
 - Version numbering fixed
 
 3.0.0-2
 - Module rebuilt
 
-2.1.4-1
-- Threaded gsoap-plugin linked with gsoap, too.
-
 3.0.1-1
 - Root directory option (ETICS performs own files relocation)
 - Prefix option as prefix inside stage
diff --git a/org.glite.lbjp-common.gsoap-plugin/project/version.properties b/org.glite.lbjp-common.gsoap-plugin/project/version.properties
index 6e8c734..b2c9f7b 100644
--- a/org.glite.lbjp-common.gsoap-plugin/project/version.properties
+++ b/org.glite.lbjp-common.gsoap-plugin/project/version.properties
@@ -1,3 +1,3 @@
 # $Header$
-module.version=2.1.4
+module.version=3.0.1
 module.age=1