Merge branch 'master' into 4.0.x (.gitignore, create --shared)

This commit is contained in:
Andrew Grieve 2014-10-04 15:30:30 -04:00
commit 862c223e11
2 changed files with 3 additions and 1 deletions

2
.gitignore vendored
View File

@ -38,3 +38,5 @@ Desktop.ini
*.iml
.idea
npm-debug.log
/node_modules
/framework/build

View File

@ -275,7 +275,7 @@ exports.createProject = function(project_path, package_name, project_name, proje
copyBuildRules(project_path);
});
// Link it to local android install.
writeProjectProperties(project_path, target_api);
writeProjectProperties(project_path, target_api, use_shared_project);
}).then(function() {
console.log('Project successfully created.');
});