From: José Fonseca <jose.r.fonseca@gmail.com>
Date: Thu, 25 Oct 2012 11:28:32 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/master' into mt-trace
X-Git-Url: https://git.cworth.org/git?p=apitrace;a=commitdiff_plain;h=bcb5850afb381e4814d247917311494d7edd2e91

Merge remote-tracking branch 'github/master' into mt-trace

Conflicts:
	retrace/glws_cocoa.mm
	wrappers/gltrace_state.cpp
---

bcb5850afb381e4814d247917311494d7edd2e91