]> rtime.felk.cvut.cz Git - frescor/frsh.git/commit
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/frescor/frsh_forb.git
authorPetr Jurcik <jurcikp@.(none)>
Mon, 10 Nov 2008 08:07:20 +0000 (09:07 +0100)
committerPetr Jurcik <jurcikp@.(none)>
Mon, 10 Nov 2008 08:07:20 +0000 (09:07 +0100)
commit81baa051ecd7ee36c7d78359ea859b38d52a18fb
treef4b50412fda77f7fdcf9fdcdc62635f57200a8c7
parent1839d9e0529aa6eaaa1900c0084c84045988146b
parentc03bab88a48af41de99ed203d9d9d5d5f5a0d278
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/frescor/frsh_forb.git

Conflicts:

resources/item/Makefile (fixed line ending)