Wojtek Figat b73ff9aaf6 Merge branch '1.1' into 1.2 ...

# Conflicts:
#	Source/Platforms/DotNet/Newtonsoft.Json.dll
#	Source/Platforms/DotNet/Newtonsoft.Json.pdb
#	Source/Platforms/UWP/Binaries/Newtonsoft.Json.dll
#	Source/Platforms/XboxOne/Binaries/Newtonsoft.Json.dll

2021-04-24 12:32:17 +02:00

..

Android

Add support for Clang 6, 8, 9 and 10 when building for Linux

2021-02-23 23:28:06 +01:00

Linux

Add support for Clang 6, 8, 9 and 10 when building for Linux

2021-02-23 23:28:06 +01:00

Unix

Fix Linxu build

2021-02-28 13:28:33 +01:00

UWP

Fixes for UWP build

2021-04-17 19:36:38 +02:00

Windows

Merge branch '1.1' into 1.2

2021-04-24 12:32:17 +02:00

XboxOne

Bumping all copyright headers to 2021.

2021-01-02 14:28:49 +01:00