rtime.felk.cvut.cz Git - frescor/frsh.git/commit

]> rtime.felk.cvut.cz Git - frescor/frsh.git/commit

projects / frescor / frsh.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: be8bb68 43c15b2)

author	Petr Jurcik <jurcikp@.(none)>
	Fri, 7 Nov 2008 12:54:56 +0000 (13:54 +0100)
committer	Petr Jurcik <jurcikp@.(none)>
	Fri, 7 Nov 2008 12:54:56 +0000 (13:54 +0100)
commit	1839d9e0529aa6eaaa1900c0084c84045988146b
tree	3e1392e44381fb32b88c3c6b32ffe727754451a6	tree \| snapshot
parent	be8bb6805827b11693a8388f9df15732b2a09da7	commit \| diff
parent	43c15b2e1238f32f59acd3c6a2ebb73eea5dfa2f	commit \| diff

Merge branch 'master' of rtime.felk.cvut.cz:/var/git/frescor/frsh_forb.git

Conflicts:

resources/item/Makefile

resources/item/Makefile

FRSH framework built on top of FORB middleware