]> rtime.felk.cvut.cz Git - frescor/demo.git/commitdiff
projects / frescor / demo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3cedbb2 43ce084)
Merge branch 'master' of rtime.felk.cvut.cz:frescor/demo master
authorMichal Sojka <sojkam1@fel.cvut.cz>
Sun, 3 Apr 2011 16:40:14 +0000 (18:40 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Sun, 3 Apr 2011 16:40:14 +0000 (18:40 +0200)

Trivial merge
Integration of FRESCOR demo