From 7b4e283eef43285c5b188955f90b9cf868c59845 Mon Sep 17 00:00:00 2001 From: dilvan1 Date: Fri, 24 Oct 2014 14:11:18 -0200 Subject: [PATCH 1/4] GWt moved to 2.6.1. Intellij files added to .gitignore --- .gitignore | 4 ++++ pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a8057c5..6ba3106 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,10 @@ .project .classpath +#Ignore Intellij files +*.iml +.idea + # Exclude build directory target/* . diff --git a/pom.xml b/pom.xml index 7df9e75..3d0af1a 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ 7.6.5.v20120716 - 2.5.1 + 2.6.1 0.4 1.4.2 From f5aa98e0c0a3b681fcac578ddd9795fa32225261 Mon Sep 17 00:00:00 2001 From: dilvan1 Date: Thu, 13 Nov 2014 10:01:15 -0200 Subject: [PATCH 2/4] Adding Dicom-3D-ROI-Editor module. --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 3d0af1a..625aaaf 100644 --- a/pom.xml +++ b/pom.xml @@ -113,6 +113,7 @@ ../epad-dto ../epad-plugins ../lesiontracking + ../Dicom-3D-ROI-Editor ../epad-ws ../epad From 5711d28e31bf04c156795a1ab28bb8b327ac1f10 Mon Sep 17 00:00:00 2001 From: Dilvan Moreira Date: Fri, 13 Feb 2015 14:07:38 -0200 Subject: [PATCH 3/4] Last before commit. --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6ba3106..1dc84c5 100644 --- a/.gitignore +++ b/.gitignore @@ -12,5 +12,6 @@ .idea # Exclude build directory -target/* +target . + From d7bc7d5f847acfb2c6e435067b9e6b41bf697d0f Mon Sep 17 00:00:00 2001 From: Dilvan Moreira Date: Thu, 2 Apr 2015 09:02:18 -0300 Subject: [PATCH 4/4] General commit after fixing SSD problem in my notebook, should not change much. --- .gitignore | 0 pom.xml | 21 +++++++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 pom.xml diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/pom.xml b/pom.xml old mode 100644 new mode 100755 index 932be63..b20d712 --- a/pom.xml +++ b/pom.xml @@ -47,6 +47,11 @@ 5.1.22 2.2.1 + 1.8.0.7 + 2.13.0 + 1.4 + 20140107 + 0.3m @@ -54,9 +59,17 @@ 1.1 R2013b - + 1.1 + R2013b + + 1.1 + R2013b + 1.1 - R2010b + R2013b + + 1.1 + R2013b UTF-8 @@ -112,9 +125,9 @@ ../epad-common ../epad-dto ../epad-plugins - ../lesiontracking ../Dicom-3D-ROI-Editor ../epad-ws + ../lesiontracking ../epad @@ -148,7 +161,7 @@ org.slf4j slf4j-api - ${slf4j.version} + ${slf4j.version}