diff options
author | Aaron Plattner <aplattner@nvidia.com> | 2010-08-17 17:45:45 -0700 |
---|---|---|
committer | Aaron Plattner <aplattner@nvidia.com> | 2010-08-17 17:45:48 -0700 |
commit | 8685f742c654a6c35a20e599f0bd639c06c06bb0 (patch) | |
tree | b0c657b0f60a583786cf931abd92b0a749fef794 | |
parent | 75efd6946ed1096590cb964f7e0daa4484d2020a (diff) | |
parent | 02b6638f05d94ca908fd3d65551bc0bc4a2ab592 (diff) |
Merge branch 'master' into for-review
* master:
xts-config.in: ":n" is a valid display name
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
0 files changed, 0 insertions, 0 deletions