]> vaikene.ee Git - evaf/commit - src/apps/PswGen/GUI/gui.cpp
Merge branch 'ScosTime' into qt5
authorEnar Väikene <enar@vaikene.net>
Thu, 7 Nov 2013 12:03:28 +0000 (14:03 +0200)
committerEnar Väikene <enar@vaikene.net>
Thu, 7 Nov 2013 12:03:28 +0000 (14:03 +0200)
commit0c61450fcffcb36a6e23ca5b083c26543d956084
treedc766470fe1b5ab528aa64c79c4b982b89abb6be
parenta81a943bee20df3c7eb34bafb3e3fe878facfe4e
parent4e8a8e8bba08252b1976428942a089fd560d19d9
Merge branch 'ScosTime' into qt5
src/apps/ScosTime/gui.cpp
src/apps/ScosTime/gui.h