Merge: The configuration control file for in OCERA tree build updated.
authorppisa <pisa@cmp.felk.cvut.cz>
Thu, 13 Jul 2006 20:47:00 +0000 (22:47 +0200)
committerppisa <pisa@cmp.felk.cvut.cz>
Thu, 13 Jul 2006 20:47:00 +0000 (22:47 +0200)
commitfe62fbd606ca30a701908ac064a56fced2555831
treec55728d039ce6f4fc2599f68f84c45a11f32d32d
parentf7b2af6ead019a96396a0f862a5b69c92260ff63
parent58069311d198060f65c6820cf110baa49c2a5a2a
Merge: The configuration control file for in OCERA tree build updated.

Merge commit 'remotes/sf-ocera-lincan/master'