]> vaikene.ee Git - evaf/commit - src/libs/Plugins/pluginmanager.cpp
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)
commit66f5040b87e8071012efbc928a4f28f8bdd615b1
treefeaa1c9609dba37cb8e1f173c924f46d6a01247f
parent125303c933569fe238a087e5f24128ff2cb30e0a
parent2bf3bf2e6edd9cb9e56cf21bfec76b2a0f983ada
Merge branch 'ScosTime' of ssh://vaikene.net/var/gitpub/evaf into ScosTime

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