[X2Go-Commits] [x2goclient] 07/87: x2goclient.pro: add x2goclientconfig.pri only containing a comment to override specific entries in x2goclient.pro in x2goclientconfig.pri.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/cleanup
in repository x2goclient.

commit 0c0925d02de205f0f79b61d4fcf8ad7bbf56889e
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Feb 13 20:40:49 2015 +0100

    x2goclient.pro: add x2goclientconfig.pri only containing a comment to override specific entries in x2goclient.pro in x2goclientconfig.pri.
---
 debian/changelog     |    2 ++
 x2goclient.pro       |    4 ++--
 x2goclientconfig.pri |    1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8126932..a95bd17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -122,6 +122,8 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium
     - Reference src/ and src/i18n/ in x2goclient.pro.
     - Move *.ui files to src/ui/ and reference in x2goclient.pro.
     - Translate and simplify header in x2goclient.pro.
+    - Add x2goclientconfig.pri only containing a comment to override specific
+      entries in x2goclient.pro in x2goclientconfig.pri.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Thu, 19 Feb 2015 12:49:22 +0100
 
diff --git a/x2goclient.pro b/x2goclient.pro
index 4b4f0ae..b9f565d 100755
--- a/x2goclient.pro
+++ b/x2goclient.pro
@@ -1,8 +1,8 @@
 # This file was created by KDevelop.
 # -------------------------------------------
 
-#include (x2goclientconfig.pri)
-
+# Override settings in this file.
+include (x2goclientconfig.pri)
 
 CONFIG += $$(X2GO_CLIENT_TARGET)
 CONFIG += $$(X2GO_LINUX_STATIC)
diff --git a/x2goclientconfig.pri b/x2goclientconfig.pri
new file mode 100644
index 0000000..edc265b
--- /dev/null
+++ b/x2goclientconfig.pri
@@ -0,0 +1 @@
+# Override settings specified in x2goclient.pro here.

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//../..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git