diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-07-21 19:05:41 -0400 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-07-21 19:05:41 -0400 |
| commit | 7465010d59ec435bd00b738f0cef766b352dc7eb (patch) | |
| tree | b87bf4909a05e86ab8899b798ff853f20e64630c /dix/main.c | |
| parent | 1d31ed778284082e1060bff63317c94581d9eb9b (diff) | |
| parent | 0aaac95b0d12089b256c97f6ff955c8c229ae095 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
Diffstat (limited to 'dix/main.c')
| -rw-r--r-- | dix/main.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/dix/main.c b/dix/main.c index 5ac8f1842..7449c5ab9 100644 --- a/dix/main.c +++ b/dix/main.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/dix/main.c,v 1.15 2006/02/15 20:44:12 ajax Exp $ */ -/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.43 2003/10/30 21:21:02 herrb Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -46,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: main.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ /* The panoramix components contained the following notice */ /***************************************************************** |