From c5eb9c4b94860e51c9cab6e4a616fcc950ee102d Mon Sep 17 00:00:00 2001
From: tkellner <tkellner@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>
Date: Tue, 21 Jun 2011 17:06:40 +0000
Subject: Merge branch 'license_change'

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@780 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c
---
 src/main/java/at/gv/egiz/pdfas/utils/ConfigUtils.java   | 2 +-
 src/main/java/at/gv/egiz/pdfas/utils/DataHashUtils.java | 3 ---
 src/main/java/at/gv/egiz/pdfas/utils/OgnlUtil.java      | 2 +-
 src/main/java/at/gv/egiz/pdfas/utils/PDFASUtils.java    | 2 +-
 src/main/java/at/gv/egiz/pdfas/utils/PdfAUtil.java      | 2 +-
 src/main/java/at/gv/egiz/pdfas/utils/StreamUtils.java   | 2 +-
 src/main/java/at/gv/egiz/pdfas/utils/TempDirHelper.java | 3 ---
 7 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'src/main/java/at/gv/egiz/pdfas/utils')

diff --git a/src/main/java/at/gv/egiz/pdfas/utils/ConfigUtils.java b/src/main/java/at/gv/egiz/pdfas/utils/ConfigUtils.java
index efefd8c..bbc64b1 100644
--- a/src/main/java/at/gv/egiz/pdfas/utils/ConfigUtils.java
+++ b/src/main/java/at/gv/egiz/pdfas/utils/ConfigUtils.java
@@ -20,7 +20,7 @@
  * file for details on the various modules and licenses.
  * The "NOTICE" text file is part of the distribution. Any derivative works
  * that you distribute must include a readable copy of the "NOTICE" text file.
- *
+ */
 package at.gv.egiz.pdfas.utils;
 
 import java.io.File;
diff --git a/src/main/java/at/gv/egiz/pdfas/utils/DataHashUtils.java b/src/main/java/at/gv/egiz/pdfas/utils/DataHashUtils.java
index 4770f42..4d834d9 100644
--- a/src/main/java/at/gv/egiz/pdfas/utils/DataHashUtils.java
+++ b/src/main/java/at/gv/egiz/pdfas/utils/DataHashUtils.java
@@ -21,9 +21,6 @@
  * The "NOTICE" text file is part of the distribution. Any derivative works
  * that you distribute must include a readable copy of the "NOTICE" text file.
  *
-/**
- * 
- */
 package at.gv.egiz.pdfas.utils;
 
 import java.io.IOException;
diff --git a/src/main/java/at/gv/egiz/pdfas/utils/OgnlUtil.java b/src/main/java/at/gv/egiz/pdfas/utils/OgnlUtil.java
index 1feafae..69b30f8 100644
--- a/src/main/java/at/gv/egiz/pdfas/utils/OgnlUtil.java
+++ b/src/main/java/at/gv/egiz/pdfas/utils/OgnlUtil.java
@@ -20,7 +20,7 @@
  * file for details on the various modules and licenses.
  * The "NOTICE" text file is part of the distribution. Any derivative works
  * that you distribute must include a readable copy of the "NOTICE" text file.
- *
+ */
 package at.gv.egiz.pdfas.utils;
 
 import java.util.ArrayList;
diff --git a/src/main/java/at/gv/egiz/pdfas/utils/PDFASUtils.java b/src/main/java/at/gv/egiz/pdfas/utils/PDFASUtils.java
index 7b2e40f..4cd3bd5 100644
--- a/src/main/java/at/gv/egiz/pdfas/utils/PDFASUtils.java
+++ b/src/main/java/at/gv/egiz/pdfas/utils/PDFASUtils.java
@@ -20,7 +20,7 @@
  * file for details on the various modules and licenses.
  * The "NOTICE" text file is part of the distribution. Any derivative works
  * that you distribute must include a readable copy of the "NOTICE" text file.
- *
+ */
 package at.gv.egiz.pdfas.utils;
 
 import java.io.BufferedOutputStream;
diff --git a/src/main/java/at/gv/egiz/pdfas/utils/PdfAUtil.java b/src/main/java/at/gv/egiz/pdfas/utils/PdfAUtil.java
index ff09b42..e741bca 100644
--- a/src/main/java/at/gv/egiz/pdfas/utils/PdfAUtil.java
+++ b/src/main/java/at/gv/egiz/pdfas/utils/PdfAUtil.java
@@ -20,7 +20,7 @@
  * file for details on the various modules and licenses.
  * The "NOTICE" text file is part of the distribution. Any derivative works
  * that you distribute must include a readable copy of the "NOTICE" text file.
- *
+ */
 package at.gv.egiz.pdfas.utils;
 
 /**
diff --git a/src/main/java/at/gv/egiz/pdfas/utils/StreamUtils.java b/src/main/java/at/gv/egiz/pdfas/utils/StreamUtils.java
index b4aa720..3dce5b1 100644
--- a/src/main/java/at/gv/egiz/pdfas/utils/StreamUtils.java
+++ b/src/main/java/at/gv/egiz/pdfas/utils/StreamUtils.java
@@ -20,7 +20,7 @@
  * file for details on the various modules and licenses.
  * The "NOTICE" text file is part of the distribution. Any derivative works
  * that you distribute must include a readable copy of the "NOTICE" text file.
- *
+ */
 package at.gv.egiz.pdfas.utils;
 
 import java.io.IOException;
diff --git a/src/main/java/at/gv/egiz/pdfas/utils/TempDirHelper.java b/src/main/java/at/gv/egiz/pdfas/utils/TempDirHelper.java
index 2959319..d468a76 100644
--- a/src/main/java/at/gv/egiz/pdfas/utils/TempDirHelper.java
+++ b/src/main/java/at/gv/egiz/pdfas/utils/TempDirHelper.java
@@ -21,9 +21,6 @@
  * The "NOTICE" text file is part of the distribution. Any derivative works
  * that you distribute must include a readable copy of the "NOTICE" text file.
  *
-/**
- * 
- */
 package at.gv.egiz.pdfas.utils;
 
 import java.io.File;
-- 
cgit v1.2.3