Merge branch 'upstreammaster'
Conflicts:
	source/dub/project.d
commit 9e3deaa5e521916c63be4e1fe21c4317ea1ec3da
2 parents 6cf405f + 24e1118
@Colden Cullen Colden Cullen authored on 6 May 2014
Showing 7 changed files
View
source/dub/commandline.d
View
source/dub/compilers/compiler.d
View
source/dub/dub.d
View
source/dub/generators/build.d
View
source/dub/generators/generator.d
View
source/dub/internal/utils.d
View
source/dub/project.d