[Bf-extensions-cvs] [36222bc5] master: Merge branch 'blender-v2.81-release'

[Julien Duroure]

Commit: 36222bc54b532c11922d38f782533bea5ec7abe3
Author: Julien Duroure
Date:   Thu Oct 31 20:13:45 2019 +0100
Branches: master
https://developer.blender.org/rBA36222bc54b532c11922d38f782533bea5ec7abe3

Merge branch 'blender-v2.81-release'

===================================================================



===================================================================

diff --cc io_scene_gltf2/__init__.py
index 5860fcac,2d44644b..abc31be7
--- a/io_scene_gltf2/__init__.py
+++ b/io_scene_gltf2/__init__.py
@@@ -15,7 -15,7 +15,11 @@@
  bl_info = {
      'name': 'glTF 2.0 format',
      'author': 'Julien Duroure, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors',
++<<<<<<< HEAD
 +    "version": (1, 0, 10),
++=======
+     "version": (1, 0, 5),
++>>>>>>> blender-v2.81-release
      'blender': (2, 81, 6),
      'location': 'File > Import-Export',
      'description': 'Import-Export as glTF 2.0',