inputproto: Changes to 'master'

[James Cloos]

 .gitignore |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit f033750780b74d72056da93fd9a91140a978891b
Merge: 369dd28... 96b0c13...
Author: James Cloos <cloos at jhcloos.com>
Date:   Mon Sep 3 06:17:20 2007 -0400

    Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/proto/inputproto

commit 369dd283cfcf006e2cfe3496ebc5157839a3d04e
Author: James Cloos <cloos at jhcloos.com>
Date:   Mon Sep 3 05:54:06 2007 -0400

    Add *~ to .gitignore to skip patch/emacs droppings