Changeset [c5e804f841c02955a5c12dfe5f65bc03e129af11] by aSydiK
Revision c5e804f841c02955a5c12dfe5f65bc03e129af11,
committed by aSydiK
· April 20th, 2011 @ 12:58 AM
Merge branch 'staged' of git://github.com/asalga/XB-PointStream.git into 117-fixColours
Conflicts:
parsers/psi.js
https://github.com/aSydiK/XB-PointStream/commit/c5e804f841c02955a5c...
8 changed files
-
A
clouds/acorn_interleaved.obj -
A
clouds/acorn_norms_last.obj -
M
demos/accelerometer/demo.js -
M
parsers/psi.js -
M
psapi.js -
M
shaders/fixed_function.js -
M
tests/psi_parser/index.html -
M
tests/psi_parser/test.js