Merge branch '3.7' into 3.8-beta

This commit is contained in:
badlogic 2019-05-15 17:05:28 +02:00
commit 23982e8206
2 changed files with 28 additions and 27 deletions

View File

@ -28,6 +28,7 @@
*****************************************************************************/
#pragma warning disable 0219
#pragma warning disable 0618 // for 3.7 branch only. Avoids "PreferenceItem' is obsolete: '[PreferenceItem] is deprecated. Use [SettingsProvider] instead."
// Original contribution by: Mitch Thompson