From: Enar Väikene <enar@vaikene.net>
Date: Tue, 10 Sep 2013 12:15:50 +0000 (+0300)
Subject: Merge branch 'ScosTime' of ssh://vaikene.net/var/gitpub/evaf into ScosTime
X-Git-Url: https://vaikene.ee/gitweb/gitweb.cgi?p=evaf;a=commitdiff_plain;h=66f5040b87e8071012efbc928a4f28f8bdd615b1

Merge branch 'ScosTime' of ssh://vaikene.net/var/gitpub/evaf into ScosTime

Conflicts:
	src/apps/ScosTime/gui.cpp
	src/apps/ScosTime/gui.h
---

66f5040b87e8071012efbc928a4f28f8bdd615b1