diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-02-21 11:47:46 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-02-21 11:47:46 +1000 |
| commit | 91c85a7d010728bf493e77527984024660eb2b6c (patch) | |
| tree | 3457a4c61638397f3f1d21ec7f3ea2a29c567c93 /COPYING | |
| parent | cc26edfba13216ceda02d9d352643535ba359e5e (diff) | |
| parent | 442527d44a07eceaf6d8b33f4b469e36afc0dcc5 (diff) | |
Merge branch 'devel' into merge
Conflicts:
src/synaptics.c
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions