using new lcVCS self indexing tree on stackfile
adding -m32 option for compiling on 64bit systems as LC doesn't support 64bit yet
Merge branch 'master' of github.com:montegoulding/mergJSON
build settings for iOS and android… both require new/modified build scripts submitted to the livecode repo
avoiding including target conditionals
Merge branch 'develop'
a couple more tweaks
Merge branch 'master' of github.com:montegoulding/mergJSON

Conflicts:
	mergJSON/external.h