Merge branch 'master' into v2

This commit is contained in:
rys ostrovid 2017-12-21 05:24:55 +01:00 committed by GitHub
commit 82f151529c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -70,6 +70,7 @@ executable haskelloids
, affection <= 0.0.0.7 , affection <= 0.0.0.7
, sdl2 >= 2.1.3.1 , sdl2 >= 2.1.3.1
, OpenGL , OpenGL
, containers , containers
, random , random
, linear , linear