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

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

1 files changed, 8 insertions, 6 deletions

diff --git a/ASTVisitor.h b/ASTVisitor.h
index 2a765e47..6e579f35 100644
--- a/ASTVisitor.h
+++ b/ASTVisitor.h
@@ -30,12 +30,14 @@ namespace dev
 namespace solidity
 {
 
-/// Visitor interface for the abstract syntax tree. This class is tightly bound to the
-/// implementation of @ref ASTNode::accept and its overrides. After a call to
-/// @ref ASTNode::accept, the function visit for the appropriate parameter is called and then
-/// (if it returns true) this continues recursively for all child nodes in document order
-/// (there is an exception for contracts). After all child nodes have been visited, endVisit is
-/// called for the node.
+/**
+ * Visitor interface for the abstract syntax tree. This class is tightly bound to the
+ * implementation of @ref ASTNode::accept and its overrides. After a call to
+ * @ref ASTNode::accept, the function visit for the appropriate parameter is called and then
+ * (if it returns true) this continues recursively for all child nodes in document order
+ * (there is an exception for contracts). After all child nodes have been visited, endVisit is
+ * called for the node.
+ */
 class ASTVisitor
 {
 public: