diff options
| author | Matthieu Herrb <matthieu@bluenote.herrb.com> | 2007-09-28 22:26:26 +0200 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@bluenote.herrb.com> | 2007-09-28 22:26:26 +0200 |
| commit | e2963ff8acb7e20aab1f8e31a656f4553dda208a (patch) | |
| tree | 16444880c7328d1d3ec60450d3d71dda807f93a5 | |
| parent | a7fda62fcb5600dc65f84148923f5a0a70181e7e (diff) | |
| parent | 051633650c7b7a7eb9ef494a48a6a79fa2e06080 (diff) | |
Merge branch 'master' of ssh://herrb@git.freedesktop.org/git/xorg/app/xinit
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | startx.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 2781850..05a7d17 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(xinit,[1.0.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinit) +AC_INIT(xinit,[1.0.7], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinit) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE @@ -198,7 +198,7 @@ dummy=0 XCOMM create a file with auth information for the server. ':0' is a dummy. xserverauthfile=$HOME/.serverauth.$$ -trap "rm -f $xserverauthfile" ERR HUP INT QUIT ILL TRAP KILL BUS TERM +trap "rm -f $xserverauthfile" HUP INT QUIT ILL TRAP KILL BUS TERM xauth -q -f $xserverauthfile << EOF add :$dummy . $mcookie EOF |