[X2go-Commits] x2goclient.git - master (branch) updated: 3.99.3.0-23-g7964d40

X2Go dev team git-admin at x2go.org
Fri Dec 14 14:51:19 CET 2012


The branch, master has been updated
       via  7964d406668eb557ad45a0bef5cb9b51e93fc69c (commit)
      from  d1cb960e424ea576ea99f0e036264712670ffba7 (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 7964d406668eb557ad45a0bef5cb9b51e93fc69c
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date:   Fri Dec 14 14:51:09 2012 +0100

    Add OpenSSL license exception

-----------------------------------------------------------------------

Summary of changes:
 README.OpenSSL-Exception |   12 ++++++++++++
 debian/changelog         |    1 +
 2 files changed, 13 insertions(+)
 create mode 100644 README.OpenSSL-Exception

The diff of changes is:
diff --git a/README.OpenSSL-Exception b/README.OpenSSL-Exception
new file mode 100644
index 0000000..817daf5
--- /dev/null
+++ b/README.OpenSSL-Exception
@@ -0,0 +1,12 @@
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
diff --git a/debian/changelog b/debian/changelog
index 520c235..acd3a05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,7 @@ x2goclient (3.99.3.1-0~x2go1) UNRELEASED; urgency=low
       minimize to systray. (Closes upstream issue #73).
     - Update license headers 
     - Add "author" entry in UI files
+    - Add OpenSSL license exception 
 
   [ Ricardo Diaz ]
   * New upstream version (3.99.3.1):


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

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 "x2goclient.git" (X2Go Client).




More information about the x2go-commits mailing list