Merge branch 'master'
authorPeter Hutterer <peter@cs.unisa.edu.au>
Thu, 8 Feb 2007 00:25:55 +0000 (10:55 +1030)
committerPeter Hutterer <whot@hyena.localdomain>
Thu, 8 Feb 2007 00:25:55 +0000 (10:55 +1030)
1  2 
XInput.h

diff --cc XInput.h
Simple merge