summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2012-03-21 15:55:41 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2012-03-21 15:55:41 +1000
commitb8e0add9ab4611a8dd75cce18709061b030096a1 (patch)
treef722eefa39a1b82a72acf5ce8468faa4a991678f
parent8a8931cc77babbd84a4ec7a1df04e995aaa1e980 (diff)
parent6001799e7380dfbe3ed21f256e538a72c53adea1 (diff)
downloadxf86-input-wacom-b8e0add9ab4611a8dd75cce18709061b030096a1.tar.gz
Merge branch 'rhel6-branch' into wacom-0.13.0
Merge made with 'git pull -s ours', discarding the old rhel6-branch history. Package was rebased to 0.13.0
0 files changed, 0 insertions, 0 deletions