Merge branch 'upstream'
[routino] / src / typesx.h
2010-12-15 Thibaut GRIDELImported Upstream version 1.5
2010-11-01 Thibaut GRIDELImported Upstream version 1.4.1