]> rtime.felk.cvut.cz Git - frescor/frsh-forb.git/commit
Merge branch 'master' of molnam1@rtime.felk.cvut.cz:/var/git/frescor/frsh_forb
authorMartin Molnar <molnam1@fel.cvut.cz>
Sun, 15 Feb 2009 17:45:26 +0000 (18:45 +0100)
committerMartin <molnam1@fel.cvut.cz>
Sun, 15 Feb 2009 17:45:26 +0000 (18:45 +0100)
commitdcbc99390b9a16fd7a2d8464e381fb8f2e6bd981
treee3c95917a079632b3db2ed3bc830f7cf20eda035
parent53746a74f6911b3cd145de05bd2503b18a8506e4
parent25defa6e9bfdf005dd5ac90eb617814d84998b88
Merge branch 'master' of molnam1@rtime.felk.cvut.cz:/var/git/frescor/frsh_forb

Conflicts:

frsh_api/tests/Makefile.omk
frsh_api/tests/Makefile.omk