]> rtime.felk.cvut.cz Git - omk.git/commit
Merge branch 'master' into devel
authorMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 18 Nov 2008 19:34:13 +0000 (20:34 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 18 Nov 2008 19:34:13 +0000 (20:34 +0100)
commit1fa2598d5b7cb860e001c7f1b1317a5c57e39847
tree44662351372dd2c06b491b58fb82512231f3e3ee
parentb63e8c215b2452c3021c2f44ba2fb8a7ef5d5d6e
parent96a6b9115df2c640836761ff41abce59edcefb74
Merge branch 'master' into devel

Conflicts:

snippets/linux
snippets/linux