]> rtime.felk.cvut.cz Git - omk.git/commit
Merge branch 'master' into devel
authorMichal Sojka <sojkam1@fel.cvut.cz>
Mon, 8 Dec 2008 18:47:25 +0000 (19:47 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Mon, 8 Dec 2008 18:47:25 +0000 (19:47 +0100)
commit3c97e82a1c4dd60060c44b926cd1610311222c09
treeb55157e7b8c23afcaeaf48aad1bce6486f161026
parent42dda1ad33cb9fde634f2bd0ff19a64718eed195
parent9c7883689f379dc56830a26e9eaacbb7fabe54af
Merge branch 'master' into devel

Conflicts:

snippets/linux
snippets/linux