diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-19 13:39:03 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-19 13:39:03 +0200 |
| commit | 1678a69116d1c6ce900fe15f7813613bb28416dd (patch) | |
| tree | 9589536f6b4bd60b34f90cf5ed20240d40bbb38c /libXext/AUTHORS | |
| parent | 9d911bc1246139019e555f443e934677a067bc0a (diff) | |
| parent | b2c925e360e2c366526de15b44603f855f94139c (diff) | |
| download | vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.gz vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.bz2 vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libfontenc/src/fontenc.c
Diffstat (limited to 'libXext/AUTHORS')
| -rw-r--r-- | libXext/AUTHORS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libXext/AUTHORS b/libXext/AUTHORS index 00e1f42cf..6e545c006 100644 --- a/libXext/AUTHORS +++ b/libXext/AUTHORS @@ -6,14 +6,14 @@ XAppgroup: Kaleb S. Keithley, X Consortium Xcup: Kaleb S, Keithley, The Open Group Xdbe: Ian Elliot, Hewlett-Packard, David Wiggens, X Consortium XEVI: Peter Daifuku, Silicon Graphics -XLbx: D. Converse, J Fulton, C. Kantarjiev, D. Lemke, R. Mor, - Keith Packard, NCD (who now believes lbx should be nuked), +XLbx: D. Converse, J Fulton, C. Kantarjiev, D. Lemke, R. Mor, + Keith Packard, NCD (who now believes lbx should be nuked), R. Tice, D. Tonogai XMultibuf: Jeffrey Friedberg, Larry Seiler, Jeff Vroom, Digital Equipment XSecurity: Dave Wiggens, X Consortium XShape: Jonathan Corbet, NCAR, Keith Packard, MIT X Consortium Xshm: Bob Scheifler and Keith Packard, MIT X Consortium -XSync: Tim Glauert, Olivetti Research, DAve Carver, Jim Gettys, +XSync: Tim Glauert, Olivetti Research, DAve Carver, Jim Gettys, Digital Equipment, Dave Wiggens, X Consortium XTestExt: Kieron Drake, UniSoft, Ltd. |