Skip to content

Commit

Permalink
Merge branch 'master' into gh-pages
Browse files Browse the repository at this point in the history
Conflicts:
	.c9/metadata/workspace/css/cheatsheet.css
	.c9/metadata/workspace/index.html
	index.html
  • Loading branch information
sudheerdev_1 committed Sep 17, 2014
2 parents d3e5ebe + 1f43493 commit e7188bb
Show file tree
Hide file tree
Showing 19 changed files with 2 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .c9/metadata/tab1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"filter":false,"title":"Immediate (Javascript (browser))","tooltip":"Immediate (Javascript (browser))","undoManager":{"mark":0,"position":0,"stack":[[{"group":"doc","deltas":[{"action":"removeText","range":{"start":{"row":0,"column":0},"end":{"row":0,"column":1.7976931348623157e+308}},"text":""},{"action":"insertText","range":{"start":{"row":0,"column":0},"end":{"row":0,"column":93}},"text":"Welcome to the Javascript REPL. This REPL allows you to test any single or multi line code in"},{"action":"insertText","range":{"start":{"row":0,"column":93},"end":{"row":1,"column":0}},"text":"\n"},{"action":"insertLines","range":{"start":{"row":1,"column":0},"end":{"row":2,"column":0}},"lines":["a browser based javascript environment (iframe). It operates similar to your browser console."]}]}]]},"immediate":{"folds":[],"scrolltop":0,"scrollleft":0,"selection":{"start":{"row":2,"column":0},"end":{"row":2,"column":0},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":0,"type":"jsbrowser","history":[],"pos":0},"timestamp":1410851838978,"hash":"bc37e9908b413249fe666f189265c03143e4d841"}
{"filter":false,"title":"Immediate (Javascript (browser))","tooltip":"Immediate (Javascript (browser))","undoManager":{"mark":0,"position":0,"stack":[[{"group":"doc","deltas":[{"action":"removeText","range":{"start":{"row":0,"column":0},"end":{"row":0,"column":1.7976931348623157e+308}},"text":""},{"action":"insertText","range":{"start":{"row":0,"column":0},"end":{"row":0,"column":93}},"text":"Welcome to the Javascript REPL. This REPL allows you to test any single or multi line code in"},{"action":"insertText","range":{"start":{"row":0,"column":93},"end":{"row":1,"column":0}},"text":"\n"},{"action":"insertLines","range":{"start":{"row":1,"column":0},"end":{"row":2,"column":0}},"lines":["a browser based javascript environment (iframe). It operates similar to your browser console."]}]}]]},"immediate":{"folds":[],"scrolltop":0,"scrollleft":0,"selection":{"start":{"row":2,"column":0},"end":{"row":2,"column":0},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":0,"type":"jsbrowser","history":[],"pos":0},"timestamp":1410955604793,"hash":"bc37e9908b413249fe666f189265c03143e4d841"}
1 change: 0 additions & 1 deletion .c9/metadata/tab100

This file was deleted.

1 change: 0 additions & 1 deletion .c9/metadata/tab102

This file was deleted.

1 change: 0 additions & 1 deletion .c9/metadata/tab65

This file was deleted.

1 change: 0 additions & 1 deletion .c9/metadata/tab79

This file was deleted.

1 change: 0 additions & 1 deletion .c9/metadata/tab83

This file was deleted.

1 change: 0 additions & 1 deletion .c9/metadata/tab85

This file was deleted.

1 change: 0 additions & 1 deletion .c9/metadata/tab97

This file was deleted.

1 change: 0 additions & 1 deletion .c9/metadata/workspace/.c9/project.settings

This file was deleted.

Loading

0 comments on commit e7188bb

Please sign in to comment.