]> rtime.felk.cvut.cz Git - frescor/frsh.git/commit
Merge branch 'master' of sojka@rtime.felk.cvut.cz:/var/git/frescor/frsh_forb
authorMichal Sojka <sojkam1@fel.cvut.cz>
Wed, 22 Oct 2008 13:45:13 +0000 (15:45 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Wed, 22 Oct 2008 13:45:13 +0000 (15:45 +0200)
commit5e110771147e60bf3a72abbdc47f8b7c6654f07a
treea541d50ce450d85aa27bf3b052efadde43190083
parent53e3bc74713766d921211ee8ac6fda06c3a9e35f
parent6ded461a3f7b1a0941f05092191c7a123f27b02a
Merge branch 'master' of sojka@rtime.felk.cvut.cz:/var/git/frescor/frsh_forb

Conflicts:

frsh_api/Makefile.omk
frsh_api/Makefile.omk