Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark
authorMichal Sojka <sojkam1@fel.cvut.cz>
Wed, 16 Feb 2011 08:20:03 +0000 (09:20 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Wed, 16 Feb 2011 08:20:03 +0000 (09:20 +0100)
commit155e8696a326af396f84d2bd09944d7338d9defb
tree73e93ce405809c20c3ae86e55c0140fa7cd69b54
parent60147f0ea81bf6410f17baf2ca2705f470fd32d5
parent24eb07b74687f89f1b55d2653b6fac98599df5f4
Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark