Merge branch 'master' into msbuilddll2
authorAtsushi Eno <atsushieno@gmail.com>
Tue, 7 Jan 2014 15:20:29 +0000 (00:20 +0900)
committerAtsushi Eno <atsushieno@gmail.com>
Tue, 7 Jan 2014 15:20:29 +0000 (00:20 +0900)
commit17183a6fbf75a5ca960d7541676aea7fd7b09d21
tree19b8a441409eb0c8df34f7052891a7ae8d3fff3f
parent40fb52be0f5d570ecb9265f2a2abc79804d7b8c5
parent7034ffa8b09a239696a1600e901853330a86c4ae
Merge branch 'master' into msbuilddll2

Conflicts:
mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConsoleLogger.cs
mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs
mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectInstance.cs
mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectTargetInstance.cs