This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch feature/cleanup in repository x2goclient. from f4e0c64 x2goclient.pro: move OS X-specific stuff from general section to macx section. new 3ea1100 x2goclient.pro: move ICON definition up before it's actually used in the macx section. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ x2goclient.pro | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 3ea110031a78528b06dea821e49807157a3d3a79 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 5 16:43:10 2015 +0100 x2goclient.pro: move ICON definition up before it's actually used in the macx section. --- debian/changelog | 2 ++ x2goclient.pro | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e2419a5..caa74ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -172,6 +172,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low + Various whitespace fixes. - Move OS X-specific stuff from general section to macx section in x2goclient.pro. + - Move ICON definition up before it's actually used in the macx section in + x2goclient.pro. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 13:25:28 +0100 diff --git a/x2goclient.pro b/x2goclient.pro index 122122a..e790d5e 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -183,6 +183,8 @@ x2go_linux_static { QMAKE_LFLAGS = -Bstatic $$QMAKE_LFLAGS } +ICON = $${PWD}/res/img/icons/x2go-mac.icns + macx { message("building $$TARGET with ldap and cups") LIBS += -framework LDAP -lcups -lcrypto -lssl -lz @@ -208,7 +210,6 @@ win32-* { CONFIG += static release } QT += svg network -ICON = $${PWD}/res/img/icons/x2go-mac.icns QMAKE_CXXFLAGS_DEBUG -= -g QMAKE_CXXFLAGS_DEBUG += -O2 -g3 -ggdb3 -gdwarf-4 -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org