lp:~imp2/lenasys/teamBranch

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:lenasys at revision 22

Gustav Hartvigsson: Approve on 2013-04-09

Diff: 277 lines (+212/-6)

4 files modified

WebGL and Benchmarking/test1shaderstartup.html (+4/-4)
db.sql (+2/-2)
js/glMatrix-0.9.5.min.js (+32/-0)
js/webgl-utils.js (+174/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

23. By mattman-03 on 2013-04-10

c11emian buggs fixed and merged

Merged branch lp:~c11emian/lenasys/c11emian_branch2

Bug #1164983: Code Tokenizer and Parser/Parser_Test.js - Doesn't follow code standard

Bug #1164995: Code Tokenizer and Parser/Parser_test.css - Doesn't follow code standard

22. By Gustav Hartvigsson <email address hidden> on 2013-04-09

Merged implementation group2:s team branch.
20130409.

Merged branch lp:~c11emian/lenasys/c11emian_branch

Bug #1163742: File that doesn't follow the code standard.

Bug #1164550: Code Tokenizer and Parser/Parser_Test.js - Not calling on the function correctly

Bug #1164571: Code Tokenizer and Parser/Parser_Test.html - HTML body onload must be changed

Bug #1166156: Incorrect type of commenting

21. By Gustav Hartvigsson on 2013-04-08

Note to self: "bzr resolve --all" works like magic.
Merged implementation group 1's branch.
20130408.

Merged branch lp:~a11vikob/lenasys/lasersPewPew

Bug #1164358: codeviewer/Codeviewer.php, codeviewer/codeviewerfunctions.php - Misnamed variables and includes

Bug #1164597: codeviewer/codeviewerfunctions.php - Identation and codestandard

20. By Gustav Hartvigsson on 2013-04-05

Merged from implementation group 1's team branch into trunk, 20130405 end of
day.

19. By Gustav Hartvigsson on 2013-04-04

Removed two DS_Store files.

18. By Gustav Hartvigsson on 2013-04-04

Readded the file that Adam Ringhede removed.

17. By Gustav Hartvigsson on 2013-04-04

Merging with implementation group 2's branch, containts an error,
will be fixed. (hopefully).

16. By Gustav Hartvigsson on 2013-04-04

Merged implementation group 2's team branch into trunk, at end-of-day 20130404.

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

merged Wikxens stuff to use localhost db, and user.

Merged branch lp:~a11vikob/lenasys/lasersPewPew

Bug #1164358: codeviewer/Codeviewer.php, codeviewer/codeviewerfunctions.php - Misnamed variables and includes

Bug #1164597: codeviewer/codeviewerfunctions.php - Identation and codestandard

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

Merged Wikxen:s fixes for DuggaSys SQL.