From: José Fonseca <jose.r.fonseca@gmail.com>
Date: Fri, 10 Aug 2012 16:39:41 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/master' into profile-gui
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=9115776479fc67fe12cc3f7ccb8da2fd684d2232;p=apitrace

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

Conflicts:
	gui/mainwindow.cpp
---

9115776479fc67fe12cc3f7ccb8da2fd684d2232
diff --cc retrace/glretrace_main.cpp
index 9972f3b,d561b55..63912ec
mode 100755,100644..100755
--- a/retrace/glretrace_main.cpp
+++ b/retrace/glretrace_main.cpp