[Bf-blender-cvs] [1d6f5b73627] temp-geometry-nodes-timings: Fix merge error

[Erik]

Commit: 1d6f5b73627886dd5c7be190620e1cc08a06e89b
Author: Erik
Date:   Sat Nov 20 18:13:27 2021 +0100
Branches: temp-geometry-nodes-timings
https://developer.blender.org/rB1d6f5b73627886dd5c7be190620e1cc08a06e89b

Fix merge error

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

M	release/datafiles/locale
M	release/scripts/addons
M	source/blender/editors/space_node/node_intern.hh
M	source/tools

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 8ee2942570f..6178bad247c 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 8ee2942570f08d10484bb2328d0d1b0aaaa0367c
+Subproject commit 6178bad247c69c9c4e1a98c5f35765752341b3ae
diff --git a/release/scripts/addons b/release/scripts/addons
index f2a08d80ccd..93d922c0d63 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit f2a08d80ccd3c13af304525778df3905f95bd44d
+Subproject commit 93d922c0d63d7bbdaf19faa6490ce8c6ccfe3f25
diff --git a/source/blender/editors/space_node/node_intern.hh b/source/blender/editors/space_node/node_intern.hh
index 2e973def867..6dc57c1fb79 100644
--- a/source/blender/editors/space_node/node_intern.hh
+++ b/source/blender/editors/space_node/node_intern.hh
@@ -96,6 +96,7 @@ void node_link_calculate_multi_input_position(const float socket_x,
                                               float r[2]);
 
 int node_get_colorid(bNode *node);
+void node_draw_extra_info_panel(const SpaceNode *snode, const bNode *node);
 int node_get_resize_cursor(int directions);
 void node_draw_shadow(const SpaceNode *snode, const bNode *node, float radius, float alpha);
 void node_draw_default(const bContext *C,
diff --git a/source/tools b/source/tools
index 2e8c8792488..b22d19e47f4 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 2e8c879248822c8e500ed49d79acc605e5aa75b9
+Subproject commit b22d19e47f4d0353082f3d9f30ee8d244c5266d5