]> rtime.felk.cvut.cz Git - frescor/frsh.git/commitdiff
projects / frescor / frsh.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1839d9e c03bab8)
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)
Conflicts:

resources/item/Makefile (fixed line ending)


Trivial merge
FRSH framework built on top of FORB middleware