projects / mono.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 40fb52b 7034ffa)
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)
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


Trivial merge
my mono mirror. check out Moved to http://github.com/mono/mono