]> vaikene.ee Git - evaf/commitdiff
projects / evaf / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 125303c 2bf3bf2)
Merge branch 'ScosTime' of ssh://vaikene.net/var/gitpub/evaf into ScosTime
authorEnar Väikene <enar@vaikene.net>
Tue, 10 Sep 2013 12:15:50 +0000 (15:15 +0300)
committerEnar Väikene <enar@vaikene.net>
Tue, 10 Sep 2013 12:15:50 +0000 (15:15 +0300)
Conflicts:
src/apps/ScosTime/gui.cpp
src/apps/ScosTime/gui.h


Trivial merge
C++ cross-platform application development framework.