Merge remote-tracking branch 'github/master' into profile-gui

author José Fonseca <jose.r.fonseca@gmail.com>

Fri, 10 Aug 2012 16:39:41 +0000 (17:39 +0100)

committer José Fonseca <jose.r.fonseca@gmail.com>

Fri, 10 Aug 2012 16:39:41 +0000 (17:39 +0100)
author José Fonseca <jose.r.fonseca@gmail.com>
Fri, 10 Aug 2012 16:39:41 +0000 (17:39 +0100)
committer José Fonseca <jose.r.fonseca@gmail.com>
Fri, 10 Aug 2012 16:39:41 +0000 (17:39 +0100)
diff --cc retrace/glretrace.py
Simple merge
diff --cc retrace/glretrace_main.cpp

index 9972f3bce6f3a5af3f81a74bc6ec583a46acb6ee,d561b55069c395d59a7fba23d7cb649c2c8e154e..63912ec9f76a4272980639a57c1d37f6574522d7

mode 100755,100644..100755
--- 1/retrace/glretrace_main.cpp
--- 2/retrace/glretrace_main.cpp
+++ b/retrace/glretrace_main.cpp
author	José Fonseca <jose.r.fonseca@gmail.com>
	Fri, 10 Aug 2012 16:39:41 +0000 (17:39 +0100)
committer	José Fonseca <jose.r.fonseca@gmail.com>
	Fri, 10 Aug 2012 16:39:41 +0000 (17:39 +0100)
		1	2
retrace/glretrace.py	patch \|	diff1 \|	diff2 \|	blob \| history
retrace/glretrace_main.cpp	patch \|	diff1 \|	diff2 \|	blob \| history