Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 7 Apr 2019 09:24:28 +0000 (11:24 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 7 Apr 2019 09:24:28 +0000 (11:24 +0200)
commite031ace3d1d06c8c55b22c64bffc2988fa1d4153
tree3d22624ee9cde951988784b3844db5dbd32aae43
parentc536b61961d73b87b420a2b904e448d06df822db
parentd780409156e838e366f4da5126e6aeab44174d62
Merge branch 'blender2.7'
intern/elbeem/intern/solver_main.cpp