Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay …

…into next-ablake
gameplay3d · Jun 19, 2012 · dae121c · dae121c
2 parents 0e195a6 + b279f7b
commit dae121c
Show file tree

Hide file tree

Showing 348 changed files with 78,289 additions and 219,176 deletions.
diff --git a/bin/macosx/gameplay-encoder b/bin/macosx/gameplay-encoder
diff --git a/external-deps/openal/lib/win32/OpenAL32.dll → bin/win32/OpenAL32.dll b/external-deps/openal/lib/win32/OpenAL32.dll → bin/win32/OpenAL32.dll
diff --git a/bin/win32/gameplay-encoder.exe b/bin/win32/gameplay-encoder.exe
diff --git a/external-deps/glew/lib/win32/glew32.dll → bin/win32/glew32.dll b/external-deps/glew/lib/win32/glew32.dll → bin/win32/glew32.dll
diff --git a/...ada-dom/lib/win32/libcollada14dom22-d.dll → bin/win32/libcollada14dom22-d.dll b/...ada-dom/lib/win32/libcollada14dom22-d.dll → bin/win32/libcollada14dom22-d.dll
diff --git a/external-deps/zlib/lib/win32/zlib.dll → bin/win32/zlib.dll b/external-deps/zlib/lib/win32/zlib.dll → bin/win32/zlib.dll
diff --git a/external-deps/glew/lib/win32/glew32mx.dll b/external-deps/glew/lib/win32/glew32mx.dll
diff --git a/external-deps/glew/lib/win32/glew32mx.lib b/external-deps/glew/lib/win32/glew32mx.lib
diff --git a/external-deps/glew/lib/win32/glew32mxs.lib b/external-deps/glew/lib/win32/glew32mxs.lib
diff --git a/external-deps/glew/lib/win32/glew32s.lib b/external-deps/glew/lib/win32/glew32s.lib
diff --git a/gameplay-api/html/annotated.html b/gameplay-api/html/annotated.html
diff --git a/gameplay-api/html/classes.html b/gameplay-api/html/classes.html
diff --git a/gameplay-api/html/classgameplay_1_1_absolute_layout-members.html b/gameplay-api/html/classgameplay_1_1_absolute_layout-members.html
diff --git a/gameplay-api/html/classgameplay_1_1_absolute_layout.html b/gameplay-api/html/classgameplay_1_1_absolute_layout.html
diff --git a/gameplay-api/html/classgameplay_1_1_animation-members.html b/gameplay-api/html/classgameplay_1_1_animation-members.html
diff --git a/gameplay-api/html/classgameplay_1_1_animation.html b/gameplay-api/html/classgameplay_1_1_animation.html
diff --git a/gameplay-api/html/classgameplay_1_1_animation_clip-members.html b/gameplay-api/html/classgameplay_1_1_animation_clip-members.html
diff --git a/gameplay-api/html/classgameplay_1_1_animation_clip.html b/gameplay-api/html/classgameplay_1_1_animation_clip.html
diff --git a/gameplay-api/html/classgameplay_1_1_animation_clip_1_1_listener-members.html b/gameplay-api/html/classgameplay_1_1_animation_clip_1_1_listener-members.html
diff --git a/gameplay-api/html/classgameplay_1_1_animation_clip_1_1_listener.html b/gameplay-api/html/classgameplay_1_1_animation_clip_1_1_listener.html