[Bf-extensions-cvs] [96e3c6f2] master: Merge branch 'blender-v2.82-release'

[Julien Duroure]

Commit: 96e3c6f25dd25aed234943eb25ab255399598865
Author: Julien Duroure
Date:   Fri Jan 24 16:59:33 2020 +0100
Branches: master
https://developer.blender.org/rBA96e3c6f25dd25aed234943eb25ab255399598865

Merge branch 'blender-v2.82-release'

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



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

diff --cc io_scene_gltf2/__init__.py
index 9410cd1d,b9a6f31e..de9ca423
--- a/io_scene_gltf2/__init__.py
+++ b/io_scene_gltf2/__init__.py
@@@ -15,7 -15,7 +15,7 @@@
  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',
-     "version": (1, 2, 6),
 -    "version": (1, 1, 40),
++    "version": (1, 2, 7),
      'blender': (2, 81, 6),
      'location': 'File > Import-Export',
      'description': 'Import-Export as glTF 2.0',