From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Thu, 19 Feb 2009 08:25:56 +0000 (+0100)
Subject: Merge branch 'master' into devel
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/omk.git/commitdiff_plain/91b0fc634c85bf80db946848612a8eeffa76e261

Merge branch 'master' into devel

Conflicts:
	snippets/include.omk
	snippets/qt.omk
---

91b0fc634c85bf80db946848612a8eeffa76e261