Merge branch 'maint'
authorSven Verdoolaege <skimo@kotnet.org>
Tue, 7 Feb 2012 11:58:43 +0000 (12:58 +0100)
committerSven Verdoolaege <skimo@kotnet.org>
Tue, 7 Feb 2012 11:58:43 +0000 (12:58 +0100)
commit5d157c90e755f6acc8b214acb5344e052136568f
tree4f678a5ed23c136b372acacef9358121ac851672
parent4282f91852c6fd6aae65bf7cbb2a412bd197088a
parent916f4261e46a9c55558ccb35732d2b9212e41c4b
Merge branch 'maint'

Conflicts:
isl_output.c

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
isl_output.c
isl_vertices.c