]> rtime.felk.cvut.cz Git - frescor/demo.git/commitdiff
projects / frescor / demo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f52c5a e76afb0)
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/frescor/demo
authorMichal Sojka <sojkam1@fel.cvut.cz>
Mon, 17 May 2010 16:52:35 +0000 (18:52 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Mon, 17 May 2010 16:52:35 +0000 (18:52 +0200)

Trivial merge
Integration of FRESCOR demo