Victor Woeltjen d3e274bfdd Merge branch 'master' into open401 ... Resolve conflicts for #416 Conflicts: platform/commonUI/browse/bundle.json platform/commonUI/browse/src/BrowseController.js		2016-02-22 14:27:21 -08:00
..
creation	Merge pull request #500 from nasa/open480	2016-02-08 11:59:54 -08:00
navigation	[Code Style] Satisfy JSLint	2015-08-11 13:03:06 -07:00
windowing	[Build] Update remaining library references	2016-01-28 11:25:44 -08:00
BrowseController.js	Merge branch 'master' into open401	2016-02-22 14:27:21 -08:00
BrowseObjectController.js	[New Edit Mode] Code style fixes	2016-01-14 15:55:02 -08:00
MenuArrowController.js	[Code Style] Use prototypes in Browse bundle	2015-08-10 11:52:23 -07:00
PaneController.js	Frontend] More refining of collapsing treeview	2015-10-26 12:19:37 -07:00