[X2Go-Commits] python-x2go.git - master (branch) updated: 0.4.0.8-43-g65d661a

X2Go dev team git-admin at x2go.org
Tue Jan 7 16:15:26 CET 2014


The branch, master has been updated
       via  65d661aab2fd13518bd5678628816e036efafe86 (commit)
      from  4808f519c54212ae6f1f8885271beb88d83b3805 (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 65d661aab2fd13518bd5678628816e036efafe86
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jan 7 16:13:38 2014 +0100

    happy new year
    
    Conflicts (resolved by Mike Gabriel):
    	x2go/backends/profiles/file.py

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

Summary of changes:
 Makefile.docupload                                 |    2 +-
 README                                             |    2 +-
 TODO                                               |    2 +-
 debian/copyright                                   |    8 ++++----
 debian/rules                                       |    2 +-
 examples/x2go_resume_session.py                    |    2 +-
 examples/x2go_start_session.py                     |    2 +-
 .../x2go_start_session_with_progress_status.py     |    2 +-
 x2go/__init__.py                                   |    2 +-
 x2go/_paramiko.py                                  |    2 +-
 x2go/backends/__init__.py                          |    2 +-
 x2go/backends/control/__init__.py                  |    2 +-
 x2go/backends/control/_stdout.py                   |    2 +-
 x2go/backends/info/__init__.py                     |    2 +-
 x2go/backends/info/_stdout.py                      |    2 +-
 x2go/backends/printing/__init__.py                 |    2 +-
 x2go/backends/printing/_file.py                    |    2 +-
 x2go/backends/printing/_gconf.py                   |    2 +-
 x2go/backends/printing/_winreg.py                  |    2 +-
 x2go/backends/profiles/__init__.py                 |    2 +-
 x2go/backends/profiles/_file.py                    |    2 +-
 x2go/backends/profiles/_gconf.py                   |    2 +-
 x2go/backends/profiles/_httpsbroker.py             |    2 +-
 x2go/backends/profiles/_winreg.py                  |    2 +-
 x2go/backends/proxy/__init__.py                    |    2 +-
 x2go/backends/proxy/_nx3.py                        |    2 +-
 x2go/backends/proxy/base.py                        |    2 +-
 x2go/backends/settings/__init__.py                 |    2 +-
 x2go/backends/settings/_file.py                    |    2 +-
 x2go/backends/settings/_gconf.py                   |    2 +-
 x2go/backends/settings/_winreg.py                  |    2 +-
 x2go/backends/terminal/__init__.py                 |    2 +-
 x2go/backends/terminal/_stdout.py                  |    2 +-
 x2go/cache.py                                      |    2 +-
 x2go/checkhosts.py                                 |    2 +-
 x2go/cleanup.py                                    |    2 +-
 x2go/client.py                                     |    2 +-
 x2go/defaults.py                                   |    2 +-
 x2go/forward.py                                    |    2 +-
 x2go/gevent_subprocess.py                          |    2 +-
 x2go/guardian.py                                   |    2 +-
 x2go/inifiles.py                                   |    2 +-
 x2go/log.py                                        |    2 +-
 x2go/mimebox.py                                    |    2 +-
 x2go/mimeboxactions.py                             |    2 +-
 x2go/printactions.py                               |    2 +-
 x2go/printqueue.py                                 |    2 +-
 x2go/pulseaudio.py                                 |    2 +-
 x2go/registry.py                                   |    2 +-
 x2go/rforward.py                                   |    2 +-
 x2go/session.py                                    |    2 +-
 x2go/sftpserver.py                                 |    2 +-
 x2go/sshproxy.py                                   |    2 +-
 x2go/utils.py                                      |    2 +-
 x2go/x2go_exceptions.py                            |    2 +-
 x2go/xserver.py                                    |    2 +-
 56 files changed, 59 insertions(+), 59 deletions(-)

The diff of changes is:
diff --git a/Makefile.docupload b/Makefile.docupload
index a82d7b7..723c538 100644
--- a/Makefile.docupload
+++ b/Makefile.docupload
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 # Makefile.docupload file - for python-x2go
-# Copyright 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>, GPLv3+ applies to this file
+# Copyright 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>, GPLv3+ applies to this file
 
 VERSION=`head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,' | cut -d"-" -f1`
 DOC_HOST=code.x2go.org
diff --git a/README b/README
index c1535ea..ed14126 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-python-x2go - Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+python-x2go - Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 
 Published under the terms of the GNU Affero General Public License.
 See http://www.gnu.org/licenses/agpl.html for a recent copy.
diff --git a/TODO b/TODO
index ee8039c..59b219c 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-python-x2go - Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+python-x2go - Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 
 Published under the terms of the GNU Affero General Public License.
 See http://www.gnu.org/licenses/agpl.html for a recent copy.
diff --git a/debian/copyright b/debian/copyright
index f1d6bb8..adf56c5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,12 +4,12 @@ Upstream-Contact: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 Source: http://code.x2go.org/releases/source/python-x2go 
 
 Files: *
-Copyright: 2010-2013, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Copyright: 2010-2014, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 License: AGPL-3+
 
 Files: x2go/gevent_subprocess.py
 Copyright:  2010, Mark Visser <mjmvisser at gmail.com>
-            2010-2013, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+            2010-2014, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 License: AGPL-3+
 Comment: The file was placed in the ,,public domain'' by Mark Visser and
  in context of the X2Go project it is published as GPL-3. The file was
@@ -17,7 +17,7 @@ Comment: The file was placed in the ,,public domain'' by Mark Visser and
  http://groups.google.com/group/gevent/browse_thread/thread/dba1a5d29e0a60ff
 
 Files: Makefile.docupload
-Copyright: 2010-2013, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Copyright: 2010-2014, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 License: GPL-3+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ License: GPL-3+
  `/usr/share/common-licenses/GPL-3'.
 
 Files: debian/*
-Copyright: 2010-2013, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Copyright: 2010-2014, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 License: GPL-2+
  Python X2Go is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff --git a/debian/rules b/debian/rules
index 4f67782..fe45644 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # debian/rules file - for python-x2go
 # Based on sample debian/rules file - for GNU Hello (1.3).
-# Copyright 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 
 WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2")
 
diff --git a/examples/x2go_resume_session.py b/examples/x2go_resume_session.py
index 26c151c..2209e2d 100644
--- a/examples/x2go_resume_session.py
+++ b/examples/x2go_resume_session.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/examples/x2go_start_session.py b/examples/x2go_start_session.py
index 2f200ec..958a822 100644
--- a/examples/x2go_start_session.py
+++ b/examples/x2go_start_session.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/examples/x2go_start_session_with_progress_status.py b/examples/x2go_start_session_with_progress_status.py
index 7bd503c..4cdc288 100644
--- a/examples/x2go_start_session_with_progress_status.py
+++ b/examples/x2go_start_session_with_progress_status.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/__init__.py b/x2go/__init__.py
index 65bd8c7..fdb6a62 100644
--- a/x2go/__init__.py
+++ b/x2go/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/_paramiko.py b/x2go/_paramiko.py
index d40903b..ddad131 100644
--- a/x2go/_paramiko.py
+++ b/x2go/_paramiko.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/backends/__init__.py b/x2go/backends/__init__.py
index 21601b4..bf089e0 100644
--- a/x2go/backends/__init__.py
+++ b/x2go/backends/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/backends/control/__init__.py b/x2go/backends/control/__init__.py
index 890975f..ef47b28 100644
--- a/x2go/backends/control/__init__.py
+++ b/x2go/backends/control/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index 41b3712..afb6bc1 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/backends/info/__init__.py b/x2go/backends/info/__init__.py
index 6cf39f7..02630ec 100644
--- a/x2go/backends/info/__init__.py
+++ b/x2go/backends/info/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/backends/info/_stdout.py b/x2go/backends/info/_stdout.py
index 6bbed1d..39801b7 100644
--- a/x2go/backends/info/_stdout.py
+++ b/x2go/backends/info/_stdout.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/backends/printing/__init__.py b/x2go/backends/printing/__init__.py
index 0fda59e..c3493c5 100644
--- a/x2go/backends/printing/__init__.py
+++ b/x2go/backends/printing/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/backends/printing/_file.py b/x2go/backends/printing/_file.py
index 3f606f0..716809a 100644
--- a/x2go/backends/printing/_file.py
+++ b/x2go/backends/printing/_file.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/backends/printing/_gconf.py b/x2go/backends/printing/_gconf.py
index 84f3a2b..86a3b79 100644
--- a/x2go/backends/printing/_gconf.py
+++ b/x2go/backends/printing/_gconf.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/backends/printing/_winreg.py b/x2go/backends/printing/_winreg.py
index b5e65e7..33e8868 100644
--- a/x2go/backends/printing/_winreg.py
+++ b/x2go/backends/printing/_winreg.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/backends/profiles/__init__.py b/x2go/backends/profiles/__init__.py
index 9766fc5..311fe8d 100644
--- a/x2go/backends/profiles/__init__.py
+++ b/x2go/backends/profiles/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/backends/profiles/_file.py b/x2go/backends/profiles/_file.py
index ac0c380..c3d19c6 100644
--- a/x2go/backends/profiles/_file.py
+++ b/x2go/backends/profiles/_file.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/backends/profiles/_gconf.py b/x2go/backends/profiles/_gconf.py
index 645a213..1c74b1b 100644
--- a/x2go/backends/profiles/_gconf.py
+++ b/x2go/backends/profiles/_gconf.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/backends/profiles/_httpsbroker.py b/x2go/backends/profiles/_httpsbroker.py
index 852630d..cc5ac90 100644
--- a/x2go/backends/profiles/_httpsbroker.py
+++ b/x2go/backends/profiles/_httpsbroker.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/backends/profiles/_winreg.py b/x2go/backends/profiles/_winreg.py
index 07f8e95..4bd91ae 100644
--- a/x2go/backends/profiles/_winreg.py
+++ b/x2go/backends/profiles/_winreg.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/backends/proxy/__init__.py b/x2go/backends/proxy/__init__.py
index 83d6aff..f4c4c37 100644
--- a/x2go/backends/proxy/__init__.py
+++ b/x2go/backends/proxy/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/backends/proxy/_nx3.py b/x2go/backends/proxy/_nx3.py
index 3fb1c7c..a8d1044 100644
--- a/x2go/backends/proxy/_nx3.py
+++ b/x2go/backends/proxy/_nx3.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/backends/proxy/base.py b/x2go/backends/proxy/base.py
index 886abc2..3554be4 100644
--- a/x2go/backends/proxy/base.py
+++ b/x2go/backends/proxy/base.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/backends/settings/__init__.py b/x2go/backends/settings/__init__.py
index a08b32a..8b9dbaf 100644
--- a/x2go/backends/settings/__init__.py
+++ b/x2go/backends/settings/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/backends/settings/_file.py b/x2go/backends/settings/_file.py
index a31cb2a..2d7e094 100644
--- a/x2go/backends/settings/_file.py
+++ b/x2go/backends/settings/_file.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/backends/settings/_gconf.py b/x2go/backends/settings/_gconf.py
index 3d2f349..1d9fb04 100644
--- a/x2go/backends/settings/_gconf.py
+++ b/x2go/backends/settings/_gconf.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/backends/settings/_winreg.py b/x2go/backends/settings/_winreg.py
index 50ffc40..e301499 100644
--- a/x2go/backends/settings/_winreg.py
+++ b/x2go/backends/settings/_winreg.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/backends/terminal/__init__.py b/x2go/backends/terminal/__init__.py
index c168066..5dc174b 100644
--- a/x2go/backends/terminal/__init__.py
+++ b/x2go/backends/terminal/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index b602341..b645177 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/cache.py b/x2go/cache.py
index b3b6968..78fb0f4 100644
--- a/x2go/cache.py
+++ b/x2go/cache.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/checkhosts.py b/x2go/checkhosts.py
index ff5fba6..ead3d91 100644
--- a/x2go/checkhosts.py
+++ b/x2go/checkhosts.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/cleanup.py b/x2go/cleanup.py
index 1cc040e..9fb708e 100644
--- a/x2go/cleanup.py
+++ b/x2go/cleanup.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/client.py b/x2go/client.py
index 210be04..9550905 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 
 #
 # Python X2Go is free software; you can redistribute it and/or modify
diff --git a/x2go/defaults.py b/x2go/defaults.py
index 0817f63..99fb1f5 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/forward.py b/x2go/forward.py
index 387f6b7..382852e 100644
--- a/x2go/forward.py
+++ b/x2go/forward.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/gevent_subprocess.py b/x2go/gevent_subprocess.py
index cdc3879..309ca88 100644
--- a/x2go/gevent_subprocess.py
+++ b/x2go/gevent_subprocess.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/guardian.py b/x2go/guardian.py
index 7ccf0a5..23365a5 100644
--- a/x2go/guardian.py
+++ b/x2go/guardian.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/inifiles.py b/x2go/inifiles.py
index 7650d9e..8d4d754 100644
--- a/x2go/inifiles.py
+++ b/x2go/inifiles.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/log.py b/x2go/log.py
index c1d538d..372a887 100644
--- a/x2go/log.py
+++ b/x2go/log.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/mimebox.py b/x2go/mimebox.py
index 90f51f5..80b5cae 100644
--- a/x2go/mimebox.py
+++ b/x2go/mimebox.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/mimeboxactions.py b/x2go/mimeboxactions.py
index 7f6a1cb..b12e9f3 100644
--- a/x2go/mimeboxactions.py
+++ b/x2go/mimeboxactions.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/printactions.py b/x2go/printactions.py
index 181e922..9698a85 100644
--- a/x2go/printactions.py
+++ b/x2go/printactions.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/printqueue.py b/x2go/printqueue.py
index 9e76ca5..2a15cba 100644
--- a/x2go/printqueue.py
+++ b/x2go/printqueue.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/pulseaudio.py b/x2go/pulseaudio.py
index ea8f49d..5fdcb8f 100644
--- a/x2go/pulseaudio.py
+++ b/x2go/pulseaudio.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/registry.py b/x2go/registry.py
index 0b46661..6c1acfc 100644
--- a/x2go/registry.py
+++ b/x2go/registry.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/rforward.py b/x2go/rforward.py
index adb780e..070ac29 100644
--- a/x2go/rforward.py
+++ b/x2go/rforward.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/session.py b/x2go/session.py
index 5a5396c..10f28fb 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/sftpserver.py b/x2go/sftpserver.py
index 02f90a2..10c1b3c 100644
--- a/x2go/sftpserver.py
+++ b/x2go/sftpserver.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 
 # The Python X2Go sFTPServer code was originally written by Richard Murri, 
 # for further information see his website: http://www.richardmurri.com
diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py
index 4121353..f76f581 100644
--- a/x2go/sshproxy.py
+++ b/x2go/sshproxy.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/utils.py b/x2go/utils.py
index 84a073a..39f5442 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/x2go_exceptions.py b/x2go/x2go_exceptions.py
index e4a1653..0ee1f57 100644
--- a/x2go/x2go_exceptions.py
+++ b/x2go/x2go_exceptions.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/xserver.py b/x2go/xserver.py
index ba9e91d..8ee3993 100644
--- a/x2go/xserver.py
+++ b/x2go/xserver.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # Python X2Go is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by


hooks/post-receive
-- 
python-x2go.git (Python X2Go Client API)

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 "python-x2go.git" (Python X2Go Client API).




More information about the x2go-commits mailing list