[Bf-extensions-cvs] [737fdfae] master: glTF exporter: bump version after blender-v2.81-release merging

Julien Duroure noreply at git.blender.org
Thu Oct 31 20:17:57 CET 2019


Commit: 737fdfae6f90c39c183c5fd925feb11b55b73abe
Author: Julien Duroure
Date:   Thu Oct 31 20:17:27 2019 +0100
Branches: master
https://developer.blender.org/rBA737fdfae6f90c39c183c5fd925feb11b55b73abe

glTF exporter: bump version after blender-v2.81-release merging

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

M	io_scene_gltf2/__init__.py

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

diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py
index abc31be7..21dd9260 100755
--- a/io_scene_gltf2/__init__.py
+++ b/io_scene_gltf2/__init__.py
@@ -15,11 +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',
-<<<<<<< HEAD
-    "version": (1, 0, 10),
-=======
-    "version": (1, 0, 5),
->>>>>>> blender-v2.81-release
+    "version": (1, 0, 12),
     'blender': (2, 81, 6),
     'location': 'File > Import-Export',
     'description': 'Import-Export as glTF 2.0',



More information about the Bf-extensions-cvs mailing list