Merge http://infra-srv1.demorecorder.com/git/free-sw/xcb/proto
authorPeter Harris <pharris@opentext.com>
Mon, 25 Aug 2014 23:31:36 +0000 (19:31 -0400)
committerPeter Harris <pharris@opentext.com>
Mon, 25 Aug 2014 23:34:30 +0000 (19:34 -0400)
commit80a79d466d1b3cb7c81c30f54035862b2d0f5f6f
tree51fe65b0bdbe123cc49233274eaa8965cd5e5c76
parent88415e63996e43ac74013250a3aa8367987182a9
parent7d8c990d6a6f6ef49793eaef46ae38eb2ebb6f39
Merge infra-srv1.demorecorder.com/git/free-sw/xcb/proto

See the mailing list for Reviewed-bys.

Thread root is
http://lists.freedesktop.org/archives/xcb/2014-August/009632.html