# Conflicts:
#   examples/MeterMeasurement.ttl
#   examples/WaterMeasurement.ttl

Do not use deprecated terms

Closes #5

See merge request !8

# Conflicts:
#   documentation/description.html

Made instances of s4watr:Water instances of s4watr:WaterKind

Closes #8

See merge request !9

Replace saref:isControlledByDevice with saref:isControlledBy
Replace saref:hasMeasurement with saref:isObservedBy
Replace saref:isMeasurementOf with saref:observes
Replace saref:makesMeasurement with saref:madeExecution
Replace saref:measurementMadeBy with saref:madeBy
Replace saref:isMeasuredByDevice with saref:isObservedBy
Replace saref:measuresProperty with saref:observes
Replace saref:relatesToMeasurement with saref:isObservedBy
Replace saref:relatesToProperty with saref:observes
Replace saref:Measurement with saref:Observation.

Updated according to the new actsUpon/observes/control properties

Closes #2

See merge request !6

Updated to new time-related properties

Closes #4

See merge request !7

Imported SAREF, SAREF4CITY and SAREF4SYST and removed the declarations of their terms

Closes #7

See merge request !5

Renamed the GeoSPARQL prefix to "geo" instead of "geosp"

Closes #6

See merge request !4

Prerelease v1.1.1

See merge request !2

Moved sources to labs.etsi.org/rep

See merge request !1

Fixed mistake in term

Closes #10

See merge request stf/stf-566/saref4watr!5

Old master

See merge request stf/stf-566/saref4watr!4

Develop v1.1.1

See merge request stf/stf-566/saref4watr!3