diff options
| author | Pushkar Joshi | 2012-02-07 07:21:27 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-07 07:21:27 -0800 |
| commit | 4bbe42e6d01fd0f81d13357a75b40eae9925dda3 (patch) | |
| tree | 57f49ebfa5d3fcef28753b34015209edda6e620a /js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js | |
| parent | e7aa17a9b472640355e95c54841399f6203050d4 (diff) | |
| parent | 8950b342d1eda8bfa195372e1c17363a409651cd (diff) | |
| download | ninja-4bbe42e6d01fd0f81d13357a75b40eae9925dda3.tar.gz | |
Merge branch 'master' into pentool
Diffstat (limited to 'js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js')
| -rw-r--r-- | js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js index ae7e5c14..0c950ffd 100644 --- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js +++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js | |||
| @@ -8,7 +8,7 @@ var cssPropertyNameList = require("js/panels/CSSPanel/css-property-name-lis | |||
| 8 | cssCompletionMap = require("js/panels/CSSPanel/css-value-completion-map").cssValueCompletionMap, | 8 | cssCompletionMap = require("js/panels/CSSPanel/css-value-completion-map").cssValueCompletionMap, |
| 9 | CSS_SHORTHAND_MAP = require("js/panels/CSSPanel/css-shorthand-map").CSS_SHORTHAND_MAP, | 9 | CSS_SHORTHAND_MAP = require("js/panels/CSSPanel/css-shorthand-map").CSS_SHORTHAND_MAP, |
| 10 | keyboardModule = require("js/mediators/keyboard-mediator").Keyboard, | 10 | keyboardModule = require("js/mediators/keyboard-mediator").Keyboard, |
| 11 | nj = require("js/lib/NJUtils.js").NJUtils; | 11 | nj = require("js/lib/NJUtils").NJUtils; |
| 12 | 12 | ||
| 13 | 13 | ||
| 14 | 14 | ||