[elvystrac] r1763 - commit before merge
- From: elvys@xxxxxxxxxxxxxxxxxxxxxx
- To: elvystrac@xxxxxxxxxxxxx
- Date: Wed, 17 Feb 2010 18:41:11 +0100
Author: JirkaH
Date: 2010-02-17 18:41:11 +0100 (Wed, 17 Feb 2010)
New Revision: 1763
Modified:
trunk/client/elvys-client/Makefile
trunk/client/elvys-client/elvys-client.pro.user
trunk/client/elvys-client/src/Makefile
Log:
commit before merge
Modified: trunk/client/elvys-client/Makefile
===================================================================
--- trunk/client/elvys-client/Makefile 2010-02-17 16:19:53 UTC (rev 1762)
+++ trunk/client/elvys-client/Makefile 2010-02-17 17:41:11 UTC (rev 1763)
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: elvys-client
-# Generated by qmake (2.01a) (Qt 4.5.3) on: Wed Feb 10 10:48:49 2010
+# Generated by qmake (2.01a) (Qt 4.5.3) on: Mon Feb 15 21:52:21 2010
# Project: elvys-client.pro
# Template: subdirs
# Command: /usr/bin/qmake -spec /usr/share/qt4/mkspecs/linux-g++ -unix
CONFIG+=debug_and_release -o Makefile elvys-client.pro
Modified: trunk/client/elvys-client/elvys-client.pro.user
===================================================================
--- trunk/client/elvys-client/elvys-client.pro.user 2010-02-17 16:19:53 UTC
(rev 1762)
+++ trunk/client/elvys-client/elvys-client.pro.user 2010-02-17 17:41:11 UTC
(rev 1763)
@@ -88,7 +88,7 @@
<value type="QString" >CONFIG_PROTECT=/usr/share/X11/xkb /var/lib/hsqldb
/usr/share/config</value>
<value type="QString" >CONFIG_PROTECT_MASK=/etc/sandbox.d /etc/env.d/java/
/etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/
/etc/php/apache2-php5/ext-active/ /etc/udev/rules.d /etc/fonts/fonts.conf
/etc/gconf /etc/terminfo /etc/ca-certificates.conf /etc/texmf/web2c
/etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d
/etc/revdep-rebuild</value>
<value type="QString" >CVS_RSH=ssh</value>
- <value type="QString"
>DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-R2PIKvvtlK,guid=115ae8503f718c05610a77224b71a116</value>
+ <value type="QString"
>DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-A0hB8LLrnq,guid=2030e7ed54f71619069908f64b74ffdf</value>
<value type="QString" >DESKTOP_SESSION=KDE-4</value>
<value type="QString" >DESKTOP_STARTUP_ID=</value>
<value type="QString" >DISPLAY=:0.0</value>
@@ -113,6 +113,7 @@
<value type="QString" >KDE_SESSION_VERSION=4</value>
<value type="QString" >LADSPA_PATH=/usr/lib/ladspa</value>
<value type="QString" >LANG=en_US.UTF-8</value>
+ <value type="QString" >LANGUAGE=</value>
<value type="QString" >LC_CTYPE=en_US.UTF-8</value>
<value type="QString" >LESS=-R -M --shift 5</value>
<value type="QString" >LESSOPEN=|lesspipe.sh %s</value>
@@ -127,7 +128,7 @@
<value type="QString"
>QT_PLUGIN_PATH=/home/keruom/.kde4/lib/kde4/plugins/:/usr/lib/kde4/plugins/</value>
<value type="QString" >RUBYOPT=-rauto_gem</value>
<value type="QString" >R_HOME=/usr/lib/R</value>
- <value type="QString"
>SESSION_MANAGER=local/LenR61:@/tmp/.ICE-unix/7052,unix/LenR61:/tmp/.ICE-unix/7052</value>
+ <value type="QString"
>SESSION_MANAGER=local/LenR61:@/tmp/.ICE-unix/6926,unix/LenR61:/tmp/.ICE-unix/6926</value>
<value type="QString"
>SGML_CATALOG_FILES=/etc/sgml/sgml-lite.cat:/etc/sgml/openjade-1.3.2.cat:/etc/sgml/dsssl-docbook-stylesheets.cat:/etc/sgml/sgml-docbook.cat:/etc/sgml/sgml-docbook-3.1.cat:/etc/sgml/sgml-ent.cat</value>
<value type="QString" >SHELL=/bin/bash</value>
<value type="QString" >SHLVL=1</value>
@@ -138,7 +139,7 @@
<value type="QString" >XCURSOR_THEME=Oxygen_Black</value>
<value type="QString" >XDG_CONFIG_DIRS=/etc/xdg</value>
<value type="QString"
>XDG_DATA_DIRS=/usr/share:/usr/local/share:/usr/share</value>
- <value type="QString"
>XDG_SESSION_COOKIE=d9adc4154425c11fe992e29e4870ae75-1265738005.664191-1899895014</value>
+ <value type="QString"
>XDG_SESSION_COOKIE=d9adc4154425c11fe992e29e4870ae75-1265958879.158627-1510381767</value>
<value type="QString" >XDM_MANAGED=method=classic</value>
<value type="QString" >_=/usr/bin/kdeinit4</value>
</valuelist>
@@ -165,7 +166,7 @@
<value type="QString" >CONFIG_PROTECT=/usr/share/X11/xkb /var/lib/hsqldb
/usr/share/config</value>
<value type="QString" >CONFIG_PROTECT_MASK=/etc/sandbox.d /etc/env.d/java/
/etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/
/etc/php/apache2-php5/ext-active/ /etc/udev/rules.d /etc/fonts/fonts.conf
/etc/gconf /etc/terminfo /etc/ca-certificates.conf /etc/texmf/web2c
/etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d
/etc/revdep-rebuild</value>
<value type="QString" >CVS_RSH=ssh</value>
- <value type="QString"
>DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-R2PIKvvtlK,guid=115ae8503f718c05610a77224b71a116</value>
+ <value type="QString"
>DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-A0hB8LLrnq,guid=2030e7ed54f71619069908f64b74ffdf</value>
<value type="QString" >DESKTOP_SESSION=KDE-4</value>
<value type="QString" >DESKTOP_STARTUP_ID=</value>
<value type="QString" >DISPLAY=:0.0</value>
@@ -190,6 +191,7 @@
<value type="QString" >KDE_SESSION_VERSION=4</value>
<value type="QString" >LADSPA_PATH=/usr/lib/ladspa</value>
<value type="QString" >LANG=en_US.UTF-8</value>
+ <value type="QString" >LANGUAGE=</value>
<value type="QString" >LC_CTYPE=en_US.UTF-8</value>
<value type="QString" >LESS=-R -M --shift 5</value>
<value type="QString" >LESSOPEN=|lesspipe.sh %s</value>
@@ -204,7 +206,7 @@
<value type="QString"
>QT_PLUGIN_PATH=/home/keruom/.kde4/lib/kde4/plugins/:/usr/lib/kde4/plugins/</value>
<value type="QString" >RUBYOPT=-rauto_gem</value>
<value type="QString" >R_HOME=/usr/lib/R</value>
- <value type="QString"
>SESSION_MANAGER=local/LenR61:@/tmp/.ICE-unix/7052,unix/LenR61:/tmp/.ICE-unix/7052</value>
+ <value type="QString"
>SESSION_MANAGER=local/LenR61:@/tmp/.ICE-unix/6926,unix/LenR61:/tmp/.ICE-unix/6926</value>
<value type="QString"
>SGML_CATALOG_FILES=/etc/sgml/sgml-lite.cat:/etc/sgml/openjade-1.3.2.cat:/etc/sgml/dsssl-docbook-stylesheets.cat:/etc/sgml/sgml-docbook.cat:/etc/sgml/sgml-docbook-3.1.cat:/etc/sgml/sgml-ent.cat</value>
<value type="QString" >SHELL=/bin/bash</value>
<value type="QString" >SHLVL=1</value>
@@ -215,7 +217,7 @@
<value type="QString" >XCURSOR_THEME=Oxygen_Black</value>
<value type="QString" >XDG_CONFIG_DIRS=/etc/xdg</value>
<value type="QString"
>XDG_DATA_DIRS=/usr/share:/usr/local/share:/usr/share</value>
- <value type="QString"
>XDG_SESSION_COOKIE=d9adc4154425c11fe992e29e4870ae75-1265738005.664191-1899895014</value>
+ <value type="QString"
>XDG_SESSION_COOKIE=d9adc4154425c11fe992e29e4870ae75-1265958879.158627-1510381767</value>
<value type="QString" >XDM_MANAGED=method=classic</value>
<value type="QString" >_=/usr/bin/kdeinit4</value>
</valuelist>
Modified: trunk/client/elvys-client/src/Makefile
===================================================================
--- trunk/client/elvys-client/src/Makefile 2010-02-17 16:19:53 UTC (rev
1762)
+++ trunk/client/elvys-client/src/Makefile 2010-02-17 17:41:11 UTC (rev
1763)
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: ../bin/elvys-client
-# Generated by qmake (2.01a) (Qt 4.5.3) on: Sun Feb 14 20:14:17 2010
+# Generated by qmake (2.01a) (Qt 4.5.3) on: Mon Feb 15 21:52:21 2010
# Project: src.pro
# Template: app
# Command: /usr/bin/qmake -spec /usr/share/qt4/mkspecs/linux-g++ -unix
CONFIG+=debug_and_release -o Makefile src.pro
Other related posts:
- » [elvystrac] r1763 - commit before merge - elvys
