Merge branch 'master' of ssh://fleuret@login.idiap.ch/homes/fleuret/public/git/selector
authorFrancois Fleuret <francois@fleuret.org>
Mon, 16 Mar 2009 20:33:06 +0000 (21:33 +0100)
committerFrancois Fleuret <francois@fleuret.org>
Mon, 16 Mar 2009 20:33:06 +0000 (21:33 +0100)
commitdb57909a08ce6bf9ce426f37a383f7ab0678f171
treec28ec6b7c7cf4241d8792e3e401482baeaad4b24
parent3a810d0b9e8b805698ee9de88ff34c2c1d13a891
parent5ec53edf02493ba52127bedc508ab53bb5c2b9f4
Merge branch 'master' of ssh://fleuret@login.idiap.ch/homes/fleuret/public/git/selector

Conflicts:
selector.cc