glproto: Changes to 'master'

[Jesse Barnes]

 glxproto.h  |   15 +++++++++++++++
 glxtokens.h |    4 ++++
 2 files changed, 19 insertions(+)

New commits:
commit 6a9361aaec49495d566db1267a21a0f4ed1b9480
Merge: c35f05decd7c1c5e4d4c1cc955c6ba9ba370b788 f2b9a6a29edf930f30eade7a0abe40a6d3c4962b
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date:   Fri Jan 8 11:43:07 2010 -0500

    Merge branch 'master' of git://people.freedesktop.org/~jbarnes/glproto

commit f2b9a6a29edf930f30eade7a0abe40a6d3c4962b
Author: Jesse Barnes <jbarnes at jbarnes-desktop.localdomain>
Date:   Thu Nov 12 16:53:13 2009 +0000

    Add GLX swap buffers event support