Merge the 'next' quasi-2.0 branch into 'master'

waffle-gl / waffle

A C library for selecting an OpenGL API and window system at runtime

https://waffle.freedesktop.org

BSD 2-Clause "Simplified" License

35 stars 16 forks source link

Merge the 'next' quasi-2.0 branch into 'master' #13

Closed linyaa-kiwi closed 9 years ago

linyaa-kiwi commented 10 years ago

Tentatively let's plan to do the merge on Tue 16 Sep if 'next' is stable enough.

linyaa-kiwi commented 9 years ago

This merge will never happen, so closing this ticket. For now, I'm following the git workflow detailed in man:gitworkflows(7), in which branches are merged upwards (maint -> master -> next) but never downards (master <- next).