Merge branch 'master' into shadersystem

This commit is contained in:
scrawl 2012-07-26 23:01:29 +02:00
commit c4ee3219c7

2
.gitmodules vendored
View file

@ -1,3 +1,3 @@
[submodule "extern/shiny"]
path = extern/shiny
url = git@github.com:scrawl/shiny.git
url = git://github.com/scrawl/shiny.git