directly inside submodule over a subfolder nested inside the containing module's .git folder.
* origin/master: (35 commits) ... Conflicts: src/brackets.js
…perf * origin/master: (110 commits) Add comment. Make sure cursor is visible after a change event is received. code review changes Add a title to the project title in the sidebar refactor perfutils to allow measurement to be updated. update TypingSpeedLogger to use new perfutils api. fix comment for _setWidth Cleanup sidebar resizer. Fix edge case when moving from snapped closed to open. Update CodeMirror SHA Update README.md fix merge issues Don't resize shadow when using absolute positioning. Fix scroller shadow resize Increase sidebar resizer width. Fix dblclick bugs. convert markStart to also accept an array Use updated hyphenated names Code review comments. Fixes selection marker when closing jstree nodes convert multiple value output to min/avg/max/last Update CodeMirror SHA Call ProjectManager.loadProject() after extensions have been loaded. fixed the dumb ol issue that I thought I fixed before with the indent. @tvoltier found it with his hawk eyes. ... Conflicts: src/editor/EditorManager.js src/utils/PerfUtils.js
…s in "@" mode (assuming at least one char has been typed to filter down the list). This was injected by a last-minute change to pull #734.
…peedLogger to use new perfutils api.
…d to open.