fix merge conflicts
authorGiovanni Gherdovich <ggherdov@brentaal.inria.fr>
Thu, 7 Oct 2010 12:40:19 +0000 (14:40 +0200)
committerGiovanni Gherdovich <ggherdov@brentaal.inria.fr>
Thu, 7 Oct 2010 12:40:19 +0000 (14:40 +0200)
commit8f437c02a1aedd746d4a7b4c51042483e2939d50
treeb8d9bc575bacd542e1eca99457e3d161ffc069ec
parentb7b7f439707e66f748e6658758f17f8bcb682c17
parentcb3b38cb5ecb4169945568e338efed9ed53735c5
fix merge conflicts
sface/sfiprocess.py