diff options
author | Aaron Plattner <aplattner@nvidia.com> | 2010-09-16 07:54:44 -0700 |
---|---|---|
committer | Aaron Plattner <aplattner@nvidia.com> | 2010-09-16 07:54:47 -0700 |
commit | b078007cf9c9af36204f6c7cb26e03871a2017b4 (patch) | |
tree | 3b34b43b04d683efd374ada81ac8c0338cc8567f | |
parent | 91f09ade8bbec95d3e6b54de216e96873aaa7bd2 (diff) | |
parent | c40b620eae84c5b5c590a16dc1f6d15f4935ae7a (diff) |
Merge branch 'master' into for-review
* 'master' of git://anongit.freedesktop.org/git/xorg/test/xts:
Clean xts-config, xts-run, and tetexec.cfg
Delete the Xt scenarios from 'all'
Include libxts5.la in Xproto and XIproto's LDADD lines
Build mc using the build architecture compiler
Reviewed-by: Joe Kain <jkain@nvidia.com>
Reviewed-by: Adam Cheney <acheney@nvidia.com>
0 files changed, 0 insertions, 0 deletions