diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2002-12-23 05:08:42 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2002-12-23 05:08:42 +0000 |
| commit | 0fc05bc893fe6d10ce615eab7a92bccee437de82 (patch) | |
| tree | 047d036e0f8dad333121f082844b22e9f77bdf24 /x11-base | |
| parent | fixes/updates (diff) | |
| download | historical-0fc05bc893fe6d10ce615eab7a92bccee437de82.tar.gz historical-0fc05bc893fe6d10ce615eab7a92bccee437de82.tar.bz2 historical-0fc05bc893fe6d10ce615eab7a92bccee437de82.zip | |
bug #12599
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xfree/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xfree/files/4.2.1-r2/Xsession | 2 | ||||
| -rw-r--r-- | x11-base/xfree/files/4.2.99.3-r1/Xsession | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index c655ff3c15fe..a1c05939ce93 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xfree # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.74 2002/12/23 04:52:09 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.75 2002/12/23 05:08:39 azarah Exp $ + + 23 Dec 2002; Martin Schlemmer <azarah@gentoo.org> : + + Fix bug #12599 (type o in Xsession). *xfree-4.2.99.3-r1 (23 Dec 2002) diff --git a/x11-base/xfree/files/4.2.1-r2/Xsession b/x11-base/xfree/files/4.2.1-r2/Xsession index 3368bd4de214..fd9fe83e2cde 100644 --- a/x11-base/xfree/files/4.2.1-r2/Xsession +++ b/x11-base/xfree/files/4.2.1-r2/Xsession @@ -65,7 +65,7 @@ elif [ -s "$startup" ]; then fi # Lastly, xsm as failsafe else - if [ -r "$resources" ]; then + if [ -r "$userresources" ]; then xrdb -load "$userresources" fi exec xsm diff --git a/x11-base/xfree/files/4.2.99.3-r1/Xsession b/x11-base/xfree/files/4.2.99.3-r1/Xsession index 3368bd4de214..fd9fe83e2cde 100644 --- a/x11-base/xfree/files/4.2.99.3-r1/Xsession +++ b/x11-base/xfree/files/4.2.99.3-r1/Xsession @@ -65,7 +65,7 @@ elif [ -s "$startup" ]; then fi # Lastly, xsm as failsafe else - if [ -r "$resources" ]; then + if [ -r "$userresources" ]; then xrdb -load "$userresources" fi exec xsm |