Merge branch 'master' into vm2

This commit is contained in:
Araq 2013-12-13 15:58:03 +01:00
commit 8c553fa8a2
33 changed files with 28859 additions and 234 deletions

View file

@ -11,6 +11,7 @@ path:"$projectPath/.."
path:"$lib/packages/docutils"
define:booting
import:testability
@if windows:
cincludes: "$lib/wrappers/libffi/common"