Merge remote-tracking branch 'upstream/master'

pull/39/head^2
Dan Armendariz 2015-03-10 21:57:45 -04:00
commit 1b7240f7af
1 zmienionych plików z 18 dodań i 18 usunięć

Wyświetl plik

@ -49,31 +49,31 @@
},
"licenses": [],
"c9plugins": {
"c9.ide.language": "#854575579b",
"c9.ide.language.css": "#afda1f867c",
"c9.ide.language.generic": "#87a4a44671",
"c9.ide.language.html": "#fa4833e117",
"c9.ide.language.html.diff": "#a7311cfc9f",
"c9.ide.language.javascript": "#26cf518b28",
"c9.ide.language.javascript.immediate": "#9a2cce9121",
"c9.ide.language": "#702802d321",
"c9.ide.language.css": "#e987616f58",
"c9.ide.language.generic": "#206b2b444a",
"c9.ide.language.html": "#7bc5b706c1",
"c9.ide.language.html.diff": "#52dc496591",
"c9.ide.language.javascript": "#a83ad1e8be",
"c9.ide.language.javascript.immediate": "#4519cfcdd3",
"c9.ide.language.javascript.eslint": "#1baacc275b",
"c9.ide.language.javascript.tern": "#a65ad88dd9",
"c9.ide.language.javascript.infer": "#ebb2daf81a",
"c9.ide.language.javascript.tern": "#41f9057196",
"c9.ide.language.javascript.infer": "#c72bd090ef",
"c9.ide.language.jsonalyzer": "#c5dfe5fb7e",
"c9.ide.collab": "#b94018ab2b",
"c9.ide.local": "#2bfd7ff051",
"c9.ide.find": "#989c06e6a7",
"c9.ide.local": "#3f4bc1098a",
"c9.ide.find": "#4026ef24c4",
"c9.ide.find.infiles": "#f98dfef554",
"c9.ide.find.replace": "#e4daf722b8",
"c9.ide.run.debug": "#b48e0147a3",
"c9.ide.run.debug": "#0af6270386",
"c9.ide.ace.emmet": "#e5f1a92ac3",
"c9.ide.ace.gotoline": "#4d1a93172c",
"c9.ide.ace.keymaps": "#6c4bb65b1f",
"c9.ide.ace.repl": "#ada99852fa",
"c9.ide.ace.repl": "#109e5997ec",
"c9.ide.ace.split": "#0ae0151c78",
"c9.ide.ace.statusbar": "#d7b45bb7c3",
"c9.ide.ace.stripws": "#34426a03d1",
"c9.ide.behaviors": "#6aad7006a0",
"c9.ide.behaviors": "#f8bfe8414d",
"c9.ide.closeconfirmation": "#a28bfd8272",
"c9.ide.configuration": "#b8470f4107",
"c9.ide.dialog.wizard": "#a588b64050",
@ -83,21 +83,21 @@
"c9.ide.imgeditor": "#08bbc53578",
"c9.ide.immediate": "#e9ba147cc2",
"c9.ide.installer": "#24e7d6f399",
"c9.ide.mount": "#32e79866ee",
"c9.ide.navigate": "#64156c7f4a",
"c9.ide.mount": "#2768f2d1fd",
"c9.ide.navigate": "#31cd1e774d",
"c9.ide.newresource": "#9a7464cc47",
"c9.ide.openfiles": "#28a4f5af16",
"c9.ide.preview": "#3c4dded23f",
"c9.ide.preview.browser": "#be197b0464",
"c9.ide.preview.markdown": "#bf952685f6",
"c9.ide.pubsub": "#92ec19ed3a",
"c9.ide.pubsub": "#46057fec09",
"c9.ide.readonly": "#f6f07bbe42",
"c9.ide.recentfiles": "#7c099abf40",
"c9.ide.remote": "#37773d905b",
"c9.ide.run": "#0a8cc7f0a9",
"c9.ide.run.build": "#6726030127",
"c9.ide.save": "#a32a8f4346",
"c9.ide.terminal.monitor": "#df9936daa2",
"c9.ide.terminal.monitor": "#211a2592f1",
"c9.ide.theme.flat": "#5c7c27ab74",
"c9.ide.threewaymerge": "#229382aa0b",
"c9.ide.undo": "#b028bcb4d5",