lp:~a11danjo/lenasys/branch

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~lenasysimpl1/lenasys/GammaBear at revision 13

Daniel Johansson: Approve on 2013-04-04

Diff: 1280 lines (+618/-611)

5 files modified

ErModeller/canvas.css (+3/-0)
ErModeller/canvas.js (+604/-0)
ErModeller/canvas_ER_demo_duggajs.html (+8/-610)
WebGL and Benchmarking/test1shaderstartup.css (+2/-0)
WebGL and Benchmarking/test1shaderstartup.html (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1163726: Code Tokenizer and Parser/Parser_Test.js - Line that doesn't follow the code standard	Undecided	Fix Committed
Bug #1163757: Code Tokenizer and Parser/Parser_Test.js - File not cleaned	Undecided	Won't Fix

Link a bug report

Related blueprints

15. By Daniel Johansson on 2013-04-03

Derped stuff to stuff

14. By Daniel Johansson on 2013-04-03

Cleaned Parser_test.js up

13. By Daniel Johansson on 2013-04-03

Solved bug in Parser_test.js

12. By Daniel Johansson on 2013-04-03

Extracted ./ErModeller/jquery.js to ./js/jquery.js

11. By Daniel Johansson on 2013-04-03

Added doctype

10. By Daniel Johansson on 2013-04-03

Broken out CSS and JavaScript from HTML in ER

9. By Daniel Johansson on 2013-04-03

Broken out inline CSS in WebGL

8. By Gustav Hartvigsson <email address hidden> on 2013-04-02

Mergerd fix for the widget library.

7. By Gustav Hartvigsson <email address hidden> on 2013-04-02

derp.
meged stuff to stuff to fix stuff.

6. By Gustav Hartvigsson <email address hidden> on 2013-04-02

Merged stuff.