svn merge ^/branches/released .

1 files changed, 0 insertions, 326 deletions

diff --git a/libXinerama/ChangeLog b/libXinerama/ChangeLog
deleted file mode 100644
index 5a673bb5f..000000000
--- a/libXinerama/ChangeLog
+++ /dev/null
@@ -1,326 +0,0 @@
-commit ee877cebfea0773a91337439d32ece12444cf0a6
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Fri Oct 2 13:27:04 2009 +1000
-
-    libXinerama 1.1
-    
-    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-
-commit c5f1f903ddf1f2216bb31408caec3e87ea795dd9
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Fri Oct 2 13:26:17 2009 +1000
-
-    Require macros 1.3 for XORG_DEFAULT_OPTIONS
-    
-    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-
-commit 46e5273f34fd950cb4757583e06d5687d1f10407
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Thu Aug 27 11:47:34 2009 +1000
-
-    libXinerama 1.0.99.1
-    
-    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-
-commit 0bfbff6d88be339f5837aa2fff016950d07a6bc5
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Thu Aug 27 11:46:33 2009 +1000
-
-    Require xineramaproto 1.1.99.1 to avoid header conflicts.
-    
-    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-
-commit 90d4d23bf2e94721149ddc0a80093b10a82e8845
-Author: Benjamin Close <Benjamin.Close@clearchain.com>
-Date:   Fri Feb 13 14:48:50 2009 +1030
-
-    Proto major/minors shouldn't live in the extension header but the proto header
-    
-    Previously the Xserver was pulling in the extension header rather than the proto header
-    this led to issues when compiling the xserver. Instead we shift the proto numbers to
-    the proto header and tell the X server to use the proto header. Hence it's possible
-    to compile the server without the lib again.
-    
-    Signed-off-by: Benjamin Close <Benjamin.Close@clearchain.com>
-    Acked-by: Daniel Stone <daniel@fooishbar.org>
-    Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
-
-commit 9810140927d4aa646f585367215d6ca684ce60a4
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Mon Feb 2 20:34:34 2009 -0800
-
-    Add README with pointers to mailing list, bugzilla & git repos
-    
-    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-
-commit 39a19b89cb7bd226ec51000d4e8e7643ac076ce6
-Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
-Date:   Fri Jan 30 03:53:40 2009 -0200
-
-    panoramiXext.h is included in X Server build.
-    
-      The X Server build only requires the value of the macros
-    PANORAMIX_MAJOR_VERSION and PANORAMIX_MINOR_VERSION.
-
-commit 7c72e844a794a9cedd9e614e919f696b47ede5e5
-Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
-Date:   Thu Jan 29 19:42:06 2009 -0200
-
-    Janitor: ansification, make distcheck, compiler warnings.
-
-commit 8123c94eba27d1a3eb3f509a79c229ddfa1f881a
-Author: Peter Hutterer <peter@cs.unisa.edu.au>
-Date:   Mon May 19 22:56:50 2008 +0930
-
-    Add Xinerama.h and panoramiXext.h to includedir.
-    
-    Were previously part of xineramaproto, but they really belong here.
-    For a history of these files please refer to
-    git://anongit.freedesktop.org/git/xorg/proto/xineramaproto
-
-commit c5ac895a7dabe5a46e33e733771f20cc08e72d95
-Author: Peter Hutterer <peter@cs.unisa.edu.au>
-Date:   Mon May 19 17:43:19 2008 +0930
-
-    Rename parameters to clarify QueryVersion/QueryExtension.
-    
-    These parameters are not treated as input. Rename them to make the inner
-    workings slightly more obvious.
-    
-    X.Org Bug 14511 <http://bugs.freedesktop.org/show_bug.cgi?id=14511>
-
-commit cbfc4113a44053c2dfacd14475ff14f43817f3c1
-Author: Adam Jackson <ajax@redhat.com>
-Date:   Thu Mar 6 15:42:56 2008 -0500
-
-    libXinerama 1.0.3
-
-commit 7c169beed2d8324c95385d248777f21c721b332e
-Author: Adam Jackson <ajax@redhat.com>
-Date:   Sun Feb 24 20:30:03 2008 -0500
-
-    Bug #13660: XineramaQueryScreens() always modifies the 'number' outparameter.
-    
-    This makes the code match the man page.
-
-commit 52040eaaba626dd998f7a5421a923de0b0e06ad2
-Author: James Cloos <cloos@jhcloos.com>
-Date:   Thu Dec 6 15:51:17 2007 -0500
-
-    Add missing PHONY line for automatic ChangeLog generation
-
-commit 5362a27db8fddfb03ade3b2c622a2256d91de9eb
-Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
-Date:   Wed Jul 25 21:41:28 2007 +0200
-
-    Fix typo in Xinerama.man
-    
-    Reported by Emanuele Rocca <ema@debian.org> in
-    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=432256
-
-commit 583d26d583bb0034ff91119ceefc08df64fbbc46
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Fri Mar 16 16:26:41 2007 -0700
-
-    Version bump: 1.0.2
-
-commit 96c081ed52e3437ede0062eb7ccfb520879cbc0e
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Fri Mar 16 16:22:21 2007 -0700
-
-    Replace static ChangeLog with dist-hook to generate from git log
-
-commit 1a5b5c7e5f603528ff69468f8d6d73e2e30442a5
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Thu Mar 1 16:56:14 2007 -0800
-
-    Add man page for Xinerama API functions
-
-commit 0062a3f12535043fd8d2dc70f41bd45fa6e8b495
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Thu Mar 1 15:41:55 2007 -0800
-
-    Remove unneeded #include of <stdio.h>
-
-commit 36a4a6f58b95ce244741df939cccef4733d80b03
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Thu Feb 15 19:06:14 2007 -0800
-
-    Clear sparse warnings & error
-    
-    Xinerama.c:56:5: warning: incorrect type in initializer (incompatible argument 1 (different types))
-    Xinerama.c:68:8: error: symbol 'close_display' redeclared with different type (originally declared at Xinerama.c:48) - incompatible argument 1 (different types)
-    Xinerama.c:283:5: warning: Using plain integer as NULL pointer
-
-commit c98be137c711235fe5bff430e93222d2a47b5e6a
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Thu Feb 15 18:59:53 2007 -0800
-
-    Add support for source code checkers such as sparse & lint
-
-commit 269885f05a4aed0eb3ee192217fa8ec6494f90c5
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Thu Feb 15 18:55:38 2007 -0800
-
-    Add *~ to .gitignore to skip over emacs/patch droppings
-
-commit e9214fe612d40bf5a792eda2dd9a52ef2bdba805
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Thu Jul 13 14:59:00 2006 -0700
-
-    renamed: .cvsignore -> .gitignore
-
-commit 29feb54b5a0e9a0bc96f02f7f8f89384afbd7feb
-Author: Kevin E Martin <kem@kem.org>
-Date:   Wed Dec 21 02:30:05 2005 +0000
-
-    Update package version for X11R7 release.
-
-commit 1da385cfa49d34cf38ec296738db9ecc8e5a2f02
-Author: Adam Jackson <ajax@nwnk.net>
-Date:   Mon Dec 19 16:28:27 2005 +0000
-
-    Stub COPYING files
-
-commit 78b498e1e7b92d59a16aa689cece7c1fdaf18eab
-Author: Kevin E Martin <kem@kem.org>
-Date:   Thu Dec 15 00:24:30 2005 +0000
-
-    Update package version number for final X11R7 release candidate.
-
-commit bf6d28d2dd4d6d20e6a8d165f22d2d8c17b16133
-Author: Kevin E Martin <kem@kem.org>
-Date:   Sat Dec 3 05:49:44 2005 +0000
-
-    Update package version number for X11R7 RC3 release.
-
-commit bacedae4107065e7b6617f3218f21a7321d8474c
-Author: Kevin E Martin <kem@kem.org>
-Date:   Sat Dec 3 04:41:50 2005 +0000
-
-    Add check and cflags for malloc(0) returning NULL.
-
-commit d1078682cc64b0a669c6180839efd8a137b90d13
-Author: Kevin E Martin <kem@kem.org>
-Date:   Sat Nov 19 07:15:41 2005 +0000
-
-    Update pkgconfig files to separate library build-time dependencies from
-        application build-time dependencies, and update package deps to work
-        with separate build roots.
-
-commit 0af77179518266232a5e3b10f180325a21dd3343
-Author: Kevin E Martin <kem@kem.org>
-Date:   Wed Oct 19 02:48:11 2005 +0000
-
-    Update package version number for RC1 release.
-
-commit 219ac4ac54207f1d5ed334efade3335ff2c64add
-Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
-Date:   Fri Aug 19 00:13:46 2005 +0000
-
-    More updates for Panoramix -> Xinerama rename
-
-commit 4306b9835f9015c38f8d5ec19526c8555a1b84cf
-Author: Adam Jackson <ajax@nwnk.net>
-Date:   Wed Aug 3 03:28:01 2005 +0000
-
-    Do PKG_CHECK_MODULES on a unique token instead of on "DEP", so builds with
-        a global configure cache don't get confused.
-
-commit 24aa28a9dad24944a006c4038c35f6302b5ea3b0
-Author: Kevin E Martin <kem@kem.org>
-Date:   Fri Jul 29 21:22:51 2005 +0000
-
-    Various changes preparing packages for RC0:
-    - Verify and update package version numbers as needed
-    - Implement versioning scheme
-    - Change bug address to point to bugzilla bug entry form
-    - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
-        reenable it)
-    - Fix makedepend to use pkgconfig and pass distcheck
-    - Update build script to build macros first
-    - Update modular Xorg version
-
-commit 5468d892030e993a2fdd4c8177cc7cb193ba0411
-Author: Daniel Stone <daniel@fooishbar.org>
-Date:   Sat Jul 16 07:14:52 2005 +0000
-
-    Set soversion to 1.0.0 using -version-number.
-
-commit 29971c16c1ad45dc8c958e12561e77e745e4a2fc
-Author: Daniel Stone <daniel@fooishbar.org>
-Date:   Tue Jul 12 07:56:48 2005 +0000
-
-    Change version to 1.1.0 and soversion to 1.0.0.
-
-commit e6417efb575017851e0e988ad99304094c36290c
-Author: Keith Packard <keithp@keithp.com>
-Date:   Sat Jul 9 06:42:31 2005 +0000
-
-    Add .cvsignore files Switch _la_CFLAGS for AM_CFLAGS to clean up directory
-
-commit 3835ed8e7aac1dfafa02ba6e33273523a6ef139f
-Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
-Date:   Tue Jun 21 15:41:36 2005 +0000
-
-    lib/XScrnSaver/configure.ac
-    lib/XScrnSaver/src/Makefile.am
-    lib/Xfontcache/configure.ac
-    lib/Xfontcache/src/Makefile.am
-    lib/Xinerama/configure.ac
-    lib/Xinerama/src/Makefile.am
-    lib/Xtst/configure.ac
-    lib/Xv/configure.ac
-    lib/XvMC/configure.ac
-    lib/dmx/configure.ac Add missing xext.pc and xextproto.pc Add DEP_CFLAGS to
-        src/Makefile.am
-
-commit 2a6c0aa8f36dad9ff49385ef15c3dfc2529483b8
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
-Date:   Fri Jun 10 19:33:53 2005 +0000
-
-    util/modular/modularizelibrary.sh: use rm -f instead of rm in one place
-        util/modular/addbuild.sh: Make it much faster by adding all the files
-        at once lib/Xinerama: check in the build system
-
-commit d7469261b17559d537660fbae0fc39fa1e37b6a2
-Author: Egbert Eich <eich@suse.de>
-Date:   Fri Apr 23 18:43:45 2004 +0000
-
-    Merging XORG-CURRENT into trunk
-
-commit c9662b6719b33f6a8dfee281fd93379ca6d4624b
-Author: Egbert Eich <eich@suse.de>
-Date:   Sun Mar 14 08:32:12 2004 +0000
-
-    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
-
-commit bbbb84282378baf72c0708933366168cbfec284e
-Author: Egbert Eich <eich@suse.de>
-Date:   Wed Mar 3 12:11:29 2004 +0000
-
-    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
-
-commit 787da2ac90290d601d0c2109c26bff9c3a66118f
-Author: Egbert Eich <eich@suse.de>
-Date:   Thu Feb 26 13:35:33 2004 +0000
-
-    readding XFree86's cvs IDs
-
-commit 27f0b1858e9939afc9b9d064bea23d6ebfe0570d
-Author: Egbert Eich <eich@suse.de>
-Date:   Thu Feb 26 09:22:43 2004 +0000
-
-    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
-
-commit a89cc18ae1eb9cf612d6f4987d49541e008a0fb4
-Author: Kaleb Keithley <kaleb@freedesktop.org>
-Date:   Fri Nov 14 16:48:49 2003 +0000
-
-    XFree86 4.3.0.1
-
-commit d16fb988d427bf8c684a80fee18a4fe6c4d1d578
-Author: Kaleb Keithley <kaleb@freedesktop.org>
-Date:   Fri Nov 14 16:48:49 2003 +0000
-
-    Initial revision