]> rtime.felk.cvut.cz Git - omk.git/commit
Merge branch 'master' into devel devel
authorMichal Sojka <sojkam1@fel.cvut.cz>
Thu, 19 Feb 2009 08:25:56 +0000 (09:25 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Thu, 19 Feb 2009 08:25:56 +0000 (09:25 +0100)
commit91b0fc634c85bf80db946848612a8eeffa76e261
treee7036e2281bfc1281c42dccfaaf43f8b9e78fb14
parent1618b906f5eacf544bc01e7a79655cebda862561
parent285b226ff16603a9bf230be671843c37b36378a6
Merge branch 'master' into devel

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