Kalle Bladin 902af5b321 Solve conflict

2017-08-07 10:24:30 +02:00

..

gpu

Remove warnings

2017-07-26 11:59:48 -04:00

layer

Solve conflict

2017-08-07 10:24:30 +02:00

chunkrenderer.cpp

Removing more warnings

2017-07-17 18:03:37 -04:00

chunkrenderer.h

Fix byte order mark commits

2017-07-17 15:54:00 -04:00

layershadermanager.cpp

More shader cleanup

2017-07-19 15:44:30 -04:00

layershadermanager.h

Fix byte order mark commits

2017-07-17 15:54:00 -04:00