[Bf-blender-cvs] [9a6be734293] greasepencil-object: Fix merge error

[Antonio Vazquez]

Commit: 9a6be734293aa6bbaf781928461c7798fbf0dfcd
Author: Antonio Vazquez
Date:   Fri Nov 17 16:29:01 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rB9a6be734293aa6bbaf781928461c7798fbf0dfcd

Fix merge error

VS2017 crash in the midle of the merge process and created wrong git tag lines

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

M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/draw/intern/draw_cache_impl.h
M	source/tools

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index b3d9c97f487..c93ed11a47b 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit b3d9c97f487bff8b2423c903c14204ba5ca21a83
+Subproject commit c93ed11a47b3016cf59711ec16de2e2e94c30e99
diff --git a/release/scripts/addons b/release/scripts/addons
index 5b02e6e1acc..371960484a3 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 5b02e6e1acc4c3cf4822607ab33f48d7cffecbd3
+Subproject commit 371960484a38fc64e0a2635170a41a0d8ab2f6bd
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index c3991195ad6..a8515cfdfe9 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit c3991195ad6eac741db27dc9e8905efb224f219d
+Subproject commit a8515cfdfe9a98127b592f36fcbe51b7e23b969a
diff --git a/source/blender/draw/intern/draw_cache_impl.h b/source/blender/draw/intern/draw_cache_impl.h
index 09642154893..89789840cee 100644
--- a/source/blender/draw/intern/draw_cache_impl.h
+++ b/source/blender/draw/intern/draw_cache_impl.h
@@ -26,12 +26,9 @@
 #ifndef __DRAW_CACHE_IMPL_H__
 #define __DRAW_CACHE_IMPL_H__
 
-<<<<<<< HEAD
 struct bGPdata;
 struct Gwn_Batch;
-=======
 struct CurveCache;
->>>>>>> blender2.8
 struct GPUMaterial;
 struct Gwn_Batch;
 struct ListBase;
diff --git a/source/tools b/source/tools
index 9ea62ef860c..b11375e8906 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 9ea62ef860cde8eb313b74cd1b23ca5a0734eefe
+Subproject commit b11375e89061303401376f7aeae42ac2fd64692a