Changeset [7221e20bdb703a351940c2521e8e7f5a00369c92] by aSydiK
Revision 7221e20bdb703a351940c2521e8e7f5a00369c92,
committed by aSydiK
· April 11th, 2011 @ 08:23 PM
Merge branch 'staged' of git://github.com/asalga/XB-PointStream.git into 99-fixNormsForPSIParser
Conflicts:
parsers/psi.js
https://github.com/aSydiK/XB-PointStream/commit/7221e20bdb703a35194...
38 changed files
-
A
demos/museum/Keyboard.js -
A
demos/museum/User.js -
A
demos/museum/Utils.js -
A
demos/museum/images/acorn.jpg -
A
demos/museum/images/floor.jpg -
A
demos/museum/images/lion.jpg -
A
demos/museum/images/mickey.jpg -
A
demos/museum/images/wall.jpg -
A
demos/museum/index.html -
A
demos/museum/museum.js -
A
demos/museum/podium.obj -
A
demos/museum/processing.js -
A
demos/museum/texture0.jpg -
A
demos/simple/example.html -
A
demos/simple/example.js -
A
shaders/cartoon.js -
A
shaders/fixed_function.js -
A
shaders/reflection.js -
A
shaders/scanline.js -
A
tests/no_dim_attrib/index.html -
A
tests/no_dim_attrib/test.js -
R
demos/many_clouds/shaders/mickey_shader.js -
R
demos/many_clouds/shaders/acorn_shader.js -
R
tests/user_parser_and_shader/user_shader.js -
R
tests/user_shader/shaders.js -
M
demos/accelerometer/demo.js -
M
demos/accelerometer/index.html -
M
demos/many_clouds/index.html -
M
demos/many_clouds/js/many_clouds.js -
M
psapi.js -
M
tests/pts/index.html -
M
tests/pts/test.js -
M
tests/resize/acorn.js -
M
tests/resize/index.html -
M
tests/user_parser_and_shader/index.html -
M
tests/user_parser_and_shader/test.js -
M
tests/user_shader/index.html -
M
tests/user_shader/test.js