[NRRPLT-8039] Reflecting the gzweb changes
Merged in NRRPLT-8039 (pull request #306) * Merged development into NRRPLT-8039 * Revert "Merged in NRRPLT-7897-xml2json (pull request #284)" This reverts commit bbb5e1ca. * [NRRPLT-8039] Reverted the xml2json commit and removed the changes related to the new collada loader * [NRRPLT-8039] Reverted the old collada loader in the index.html * Merge branch 'development' into NRRPLT-8039 Approved-by: Ugo Albanese Approved-by: Sandro Weber
Showing
- app/index.html 1 addition, 0 deletionsapp/index.html
- bower.json 1 addition, 0 deletionsbower.json
- bower_components/gz3d-hbp/bower.json 4 additions, 1 deletionbower_components/gz3d-hbp/bower.json
- bower_components/gz3d-hbp/gz3d/build/gz3d.js 10 additions, 9 deletionsbower_components/gz3d-hbp/gz3d/build/gz3d.js
- bower_components/xml2json/.bower.json 32 additions, 0 deletionsbower_components/xml2json/.bower.json
- bower_components/xml2json/README.md 10 additions, 0 deletionsbower_components/xml2json/README.md
- bower_components/xml2json/bower.json 23 additions, 0 deletionsbower_components/xml2json/bower.json
- bower_components/xml2json/xml2json.js 171 additions, 0 deletionsbower_components/xml2json/xml2json.js
- test/karma.conf.js 1 addition, 0 deletionstest/karma.conf.js
Please register or sign in to comment