Kalle Bladin 85d9ff8eee Solve merge conflict.

2016-05-10 19:36:17 -04:00

..

culling.cpp

Add class horizonculler and fix for explicit opengl types.

2016-05-09 23:19:49 -04:00

culling.h

Add class horizonculler and fix for explicit opengl types.

2016-05-09 23:19:49 -04:00

patchrenderer.cpp

Solve merge conflict.

2016-05-10 19:36:17 -04:00

patchrenderer.h

Merged ChunkIndex and GeodeticTileIndex

2016-05-10 15:47:58 -04:00