Erik Broberg a050a58981 Solve merge conflicts

2016-10-25 19:05:37 +02:00

..

cachingtileprovider.cpp

Solve bug that caused incorrect height for no data values.

2016-10-20 15:04:59 +02:00

cachingtileprovider.h

Solve bug that caused incorrect height for no data values.

2016-10-20 15:04:59 +02:00

singleimageprovider.cpp

Create namespace globebrowsing.

2016-10-18 15:40:27 +02:00

singleimageprovider.h

Create namespace globebrowsing.

2016-10-18 15:40:27 +02:00

temporaltileprovider.cpp

Create namespace globebrowsing.

2016-10-18 15:40:27 +02:00

temporaltileprovider.h

Create namespace globebrowsing.

2016-10-18 15:40:27 +02:00

texttileprovider.cpp

Create namespace globebrowsing.

2016-10-18 15:40:27 +02:00

texttileprovider.h

Create namespace globebrowsing.

2016-10-18 15:40:27 +02:00

tileprovider.cpp

Solve merge conflicts

2016-10-25 19:05:37 +02:00

tileprovider.h

Merge

2016-10-25 18:30:15 +02:00