Skip to content

Commit ba09715

Browse files
committed
Merge branch 'master' into release/2014
Conflicts: _includes/index.md
2 parents 8b1ee23 + 38d0c67 commit ba09715

File tree

4 files changed

+1
-0
lines changed

4 files changed

+1
-0
lines changed
2.39 KB
Binary file not shown.
773 Bytes
Binary file not shown.
13.1 KB
Binary file not shown.

_includes/tips.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535

3636
### Tools
3737
* [jsRocket](https://github.com/mog/jsRocket) **recommended** : to easily sync your demos!
38+
* [LeSequencer](https://github.com/kaneel/LeSequencer) : A simple sequencer written in javascript (convert the current ms into ticks and beats & more)
3839
* [ShaderToy](http://www.iquilezles.org/apps/shadertoy/) : play with shaders + a lot of examples
3940
* [GLSL sandbox](http://glsl.heroku.com/) : Same as above, with different samples
4041
* [WebGLU](https://github.com/OneGeek/WebGLU)

0 commit comments

Comments
 (0)