Commit: 79f51239a35a0fc13ff9a5007cd2fdb39523cdd2
Author: Dalai Felinto
Date: Fri Nov 14 01:25:49 2014 -0200
Branches: testbuild
https://developer.blender.org/rB79f51239a35a0fc13ff9a5007cd2fdb39523cdd2
Merge remote-tracking branch 'origin/master' into testbuild
Conflicts:
release/datafiles/locale
release/scripts/addons
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
