]> git.cworth.org Git - apitrace/commit
Merge remote-tracking branch 'github/master' into profile-gui
authorJosé Fonseca <jose.r.fonseca@gmail.com>
Fri, 10 Aug 2012 16:39:41 +0000 (17:39 +0100)
committerJosé Fonseca <jose.r.fonseca@gmail.com>
Fri, 10 Aug 2012 16:39:41 +0000 (17:39 +0100)
commit9115776479fc67fe12cc3f7ccb8da2fd684d2232
tree20458cee1e87480dda0dd063bda38c10faf9a2b5
parent27af35ae3464ad0cd891d301c9b821951334e71d
parentd0ff69f61b95779363539aa61a1ec82258d23d3b
Merge remote-tracking branch 'github/master' into profile-gui

Conflicts:
gui/mainwindow.cpp
retrace/glretrace.py
retrace/glretrace_main.cpp