]> git.cworth.org Git - apitrace/commitdiff
Merge branch 'gui-thumbnails'
authorJosé Fonseca <jose.r.fonseca@gmail.com>
Sat, 24 Mar 2012 09:30:51 +0000 (09:30 +0000)
committerJosé Fonseca <jose.r.fonseca@gmail.com>
Sat, 24 Mar 2012 09:30:51 +0000 (09:30 +0000)
1  2 
gui/mainwindow.cpp
gui/mainwindow.h

Simple merge
Simple merge