Shaders branch

[Владимир Побединский]

shaders branch will be never merged into master branch?

[Lasse Öörni]

If I remember right primitivewaste was not yet finished with the work back then. It's always preferable to have the original author merge the feature branch work into master. Currently both the 2d & shaders branch haven't had more commits for a while.

[Sebastian Delatorre]

I've been on vacation so I haven't done any recent work on the shaders branch. I will continue working on it and plan on merging it into master when finished.