From 5ecc2b10d32e257518a771f5a6c0244fc3ac9569 Mon Sep 17 00:00:00 2001
From: Alon Levy <alon@pobox.com>
Date: Wed, 4 Mar 2015 00:05:57 +0200
Subject: client: s/setup_merge_button/setup_toolbar/

---
 src/client/view/selection.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/client/view/selection.js')

diff --git a/src/client/view/selection.js b/src/client/view/selection.js
index cd16ef51..5e24e801 100644
--- a/src/client/view/selection.js
+++ b/src/client/view/selection.js
@@ -223,7 +223,7 @@ var update = function(nodes, append)
     }
 }
 
-var setup_merge_button = function(main_graph)
+var setup_toolbar = function(main_graph)
 {
     var merge_root_selection = function() {
             main_graph.nodes__merge(root_nodes_ids());
@@ -269,7 +269,7 @@ return {
     node_selected: node_selected,
     link_selected: link_selected,
     selectionChangedBus: selectionChangedBus,
-    setup_merge_button: setup_merge_button,
+    setup_toolbar: setup_toolbar,
 
     __get_root_nodes: function() { return root_nodes; },
     __get_selected_nodes: function() { return selected_nodes; },
-- 
cgit v1.3.1