• Claus Nagel's avatar
    Merge branch 'citygml3' into fix-model · d7e9978c
    Claus Nagel authored
    # Conflicts:
    #	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Checking.java
    #	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ComponentList.java
    #	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Edge.java
    #	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/EdgeList.java
    #	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Error.java
    #	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/FeatureStatistics.java
    #	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Filter.java
    #	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/GlobalParameters.java
    #	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Parameter.java
    #	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PolygonIdList.java
    #	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Requirement.java
    #	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Statistics.java
    #	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ValidationPlan.java
    #	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ValidationResult.java
    d7e9978c