]> rtime.felk.cvut.cz Git - frescor/demo.git/commitdiff
projects / frescor / demo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f43cfb 018daf8)
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/frescor/demo
authorMichal Sojka <sojkam1@fel.cvut.cz>
Mon, 30 Nov 2009 17:47:49 +0000 (18:47 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Mon, 30 Nov 2009 17:47:49 +0000 (18:47 +0100)

Trivial merge
Integration of FRESCOR demo