Merge branch 'master' into luminance_wavefront

This commit is contained in:
Dimitri 'phaazon' Sabadie 2015-10-24 14:10:48 +02:00
commit 7eaf87abab

View File

@ -1628,6 +1628,9 @@ packages:
# https://github.com/purescript/purescript/issues/1544
- purescript < 0.7.5
# https://github.com/fpco/stackage/issues/922
- generics-sop < 0.2
# end of packages