glproto: Changes to 'master'

Mon Sep 3 12:19:22 PDT 2007

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

New commits:
commit e89ed37e56e2dec95fd43778f3a72bafca1d56e3
Merge: 2adf876... 750a853...
Author: James Cloos <cloos at jhcloos.com>
Date:   Mon Sep 3 06:17:08 2007 -0400

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

commit 2adf876f7bb078b86f7e967d3115e25cfc9c705d
Author: James Cloos <cloos at jhcloos.com>
Date:   Mon Sep 3 05:54:04 2007 -0400

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