/lenasys/trunk

To get this branch, use:

bzr branch
http://gegoxaren.bato24.eu/bzr/lenasys/trunk

Viewing all changes in revision 21.

Committer: Gustav Hartvigsson
Date: 2013-04-08 08:05:58 UTC
mfrom: (19.4.4 lenasys)
Revision ID: gustav.hartvigsson@gmail.com-20130408080558-0o7itutyu7jrn48b

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

files removed:
js/glMatrix-0.9.5.min.js

js/webgl-utils.js

files renamed:
DuggaSys/changePassword/pageframe.php => DuggaSys/changePassword/pageframe.html.php

DuggaSys/changePassword/password.php => DuggaSys/changePassword/password.html.php

DuggaSys/quizSystem/course/courses.php => DuggaSys/quizSystem/course/courses.html.php

DuggaSys/quizSystem/data/displayData.php => DuggaSys/quizSystem/data/displayData.html.php

DuggaSys/quizSystem/login/login.php => DuggaSys/quizSystem/login/login.html.php

DuggaSys/quizSystem/pageframe.php => DuggaSys/quizSystem/pageframe.html.php

DuggaSys/quizSystem/quiz/addEditQuiz.php => DuggaSys/quizSystem/quiz/addEditQuiz.html.php

DuggaSys/quizSystem/quiz/editVariants.php => DuggaSys/quizSystem/quiz/editVariants.html.php

DuggaSys/quizSystem/quiz/listDataObjects.php => DuggaSys/quizSystem/quiz/listDataObjects.html.php

DuggaSys/quizSystem/quiz/listQuizzes.php => DuggaSys/quizSystem/quiz/listQuizzes.html.php

DuggaSys/quizSystem/quizChecking/listQuizAnswers.php => DuggaSys/quizSystem/quizChecking/listQuizAnswers.html.php

DuggaSys/quizSystem/quizChecking/quizAnswerDetails.php => DuggaSys/quizSystem/quizChecking/quizAnswerDetails.html.php

DuggaSys/quizSystem/quizChecking/selectCourse.php => DuggaSys/quizSystem/quizChecking/selectCourse.html.php

DuggaSys/quizSystem/quizChecking/selectQuiz.php => DuggaSys/quizSystem/quizChecking/selectQuiz.html.php

DuggaSys/quizSystem/registerStudents/parsingResult.php => DuggaSys/quizSystem/registerStudents/parsingResult.html.php

DuggaSys/quizSystem/registerStudents/print.php => DuggaSys/quizSystem/registerStudents/print.html.php

DuggaSys/quizSystem/search/search.php => DuggaSys/quizSystem/search/search.html.php

DuggaSys/quizSystem/students/listStudents.php => DuggaSys/quizSystem/students/listStudents.html.php

js/httpAjax.js => WebGL and Benchmarking/httpAjax.js

js/webgl-helpers.js => WebGL and Benchmarking/webgl-helpers.js

files modified:
WebGL and Benchmarking/test1shaderstartup.html

db.sql

Show diffs side-by-side

added added

removed removed

WebGL and Benchmarking/test1shaderstartup.html

js/glMatrix-0.9.5.min.js

js/webgl-utils.js

Older »