Merge branch 'master' of ssh://fleuret@login.idiap.ch/homes/fleuret/public/git/selector
authorFrancois Fleuret <francois@fleuret.org>
Mon, 13 Apr 2009 13:03:21 +0000 (15:03 +0200)
committerFrancois Fleuret <francois@fleuret.org>
Mon, 13 Apr 2009 13:03:21 +0000 (15:03 +0200)
commit0b612866f322be462e80586db5bd4bce6d4fefe9
tree721387cf5140c17af342746080d0d0c0b3fd020b
parentd315ca7da55314820815549dec320f68290c4e90
parente9a5dbfb21e1c625bed5683b9170d1a76ba75a56
Merge branch 'master' of ssh://fleuret@login.idiap.ch/homes/fleuret/public/git/selector

Conflicts:
selector.cc