delta/xserver.git/Xext, branch input-hotpluggitlab.freedesktop.org: xorg/xserver.git
Merge branch 'master' into my-XACE-modular2006-09-15T19:26:57+00:00Eamon Walshewalsh@tycho.nsa.gov2006-09-15T19:26:57+00:0049a70c8570b03aff8239324a2474918a6fbc52a0
Generalize the handling of configuration files that ship with extensions.2006-09-08T19:28:48+00:00Eamon Walshewalsh@tycho.nsa.gov2006-09-08T19:28:48+00:00d1110c5c83a7f439158f369ab2f3ae614fa9d2a5
Include dix-config.h.2006-09-08T19:23:06+00:00Eamon Walshewalsh@tycho.nsa.gov2006-09-08T19:23:06+00:000fba09cdfcc78161f5c92bef6cca53e5309656bd
Don't need to allocate memory now that devPrivates are being used.2006-09-08T19:21:57+00:00Eamon Walshewalsh@tycho.nsa.gov2006-09-08T19:21:57+00:00c93877100eb98647c5b6b8556730d54677f730b6
Fix #include paths for fontcacheproto headers.2006-09-06T11:18:02+00:00Michel Dänzermichel@tungstengraphics.com2006-09-06T11:18:02+00:00f6ce0839ba5b73247097826d28f7388fe248ec0c
Merge branch 'master' into my-XACE-modular2006-09-05T22:03:25+00:00Eamon Walshewalsh@tycho.nsa.gov2006-09-05T22:03:25+00:000b81fccd2ee4e054e5cffb739de07460ff2c13f7
Conflicts:
configure.ac
Conflicts:
configure.ac
Re-add support for tslib (1.0 release) and Xcalibrate extension.2006-08-29T21:07:15+00:00Matthew Allummallum@openedhand.com2006-08-29T21:07:15+00:005ddbf4bcd46fe0d3d682668c2748c712fea410ae
Add four new XACE hooks: auditing, key event notification, window init2006-08-25T22:17:01+00:00Eamon Walshewalsh@tycho.nsa.gov2006-08-25T22:17:01+00:0013c6713c82763a85c725c998b37ad02156d803ba
Merge branch 'XACE-modular' into my-XACE-modular2006-08-21T22:49:31+00:00Eamon Walshewalsh@tycho.nsa.gov2006-08-21T22:49:31+00:0052ba722e4c89c052609b4fc62e965d92778aa2dd
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular2006-08-10T17:37:59+00:00Alan Coopersmithalan.coopersmith@sun.com2006-08-10T17:37:59+00:00c2535f67923bde0bfb0e72363467110806e2f40f