Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler

Browse Source

Conflicts:
	libsolidity/AST.cpp
	libsolidity/AST.h
	libsolidity/Compiler.cpp
	libsolidity/Compiler.h
	libsolidity/NameAndTypeResolver.h
	libsolidity/Types.cpp
	solc/main.cpp
	test/solidityCompiler.cpp

...

This commit is contained in:

Christian 2014-10-31 17:20:27 +01:00

parent 9eb7fd274c bb2b4ed3a3

commit 245efb0280

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available