From 2b66ec5230917c763b8efdc0985eb18b218098d9 Mon Sep 17 00:00:00 2001
From: Matthijs van Henten <matthijs@c9.io>
Date: Fri, 24 Apr 2015 13:46:52 +0000
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into
 profile-001-1-create-project

Conflicts:
	plugins/c9.profile.page.project/project-page.js
	settings/devel/workspace-types.js
	settings/devel/workspace-types_test.js
---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index c05cbbbd..629af2af 100644
--- a/package.json
+++ b/package.json
@@ -95,6 +95,7 @@
         "c9.ide.readonly": "#f6f07bbe42",
         "c9.ide.recentfiles": "#7c099abf40",
         "c9.ide.remote": "#cd45e81d2f",
+        "c9.ide.processlist": "#bc11818bb5",
         "c9.ide.run": "#71c5562e42",
         "c9.ide.run.build": "#ad45874c88",
         "c9.ide.run.debug.xdebug": "#b91d23f48b",