Kalle Bladin 902af5b321 Solve conflict

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

..

layer.cpp

Add description to PropertyOwner

2017-08-01 17:05:52 -04:00

layer.h

Fix byte order mark commits

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

layeradjustment.cpp

Add description to PropertyOwner

2017-08-01 17:05:52 -04:00

layeradjustment.h

Fix byte order mark commits

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

layergroup.cpp

Solve conflict

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

layergroup.h

Fix byte order mark commits

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

layergroupid.h

Hide layergroups in RenderableGlobe that do not contain any layers

2017-07-28 14:49:08 -04:00

layermanager.cpp

Add description to PropertyOwner

2017-08-01 17:05:52 -04:00

layermanager.h

Fix byte order mark commits

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

layerrendersettings.cpp

Add description to PropertyOwner

2017-08-01 17:05:52 -04:00

layerrendersettings.h

More work on documentation

2017-07-25 18:06:55 -04:00