From c6f3358aaf090f4fb40ac165b8586ca8279f6816 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Mon, 30 Nov 2015 09:43:02 +0000 Subject: [PATCH] Add icons for syncing --- configs/client-default.js | 9 ++++++--- package.json | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/configs/client-default.js b/configs/client-default.js index 09509385..c323fbfd 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -807,8 +807,11 @@ module.exports = function(options) { "plugins/c9.ide.test.mocha/mocha", // git integration + { + packagePath: "plugins/c9.ide.scm/scm.commit", + staticPrefix: staticPrefix + "/plugins/c9.ide.scm" + }, "plugins/c9.ide.scm/scm", - "plugins/c9.ide.scm/scm.commit", "plugins/c9.ide.scm/scm.branches", "plugins/c9.ide.scm/dialog.localchanges", "plugins/c9.ide.scm/scm.log", @@ -816,8 +819,8 @@ module.exports = function(options) { "plugins/c9.ide.scm/detail", // "plugins/c9.ide.scm/log", "plugins/c9.ide.scm/git", - "plugins/c9.ide.scm/editor", - "plugins/c9.ide.scm/mergetool", + "plugins/c9.ide.scm/diff.sidebyside", + "plugins/c9.ide.scm/mergetool" // // git integration v1 // "plugins/c9.ide.scm/v1/scm", diff --git a/package.json b/package.json index 1f0f0b78..651ced15 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#95a0c688d0", + "c9.ide.scm": "#2af39fcbb5", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2",