]> rtime.felk.cvut.cz Git - omk.git/commitdiff
projects / omk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1618b90 285b226)
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)
Conflicts:
snippets/include.omk
snippets/qt.omk


Trivial merge
Ocera Make System