| commit | 38e08858e6ba18437f0a65a1a5f89915b399e784 | |
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | |
| Tue, 7 Apr 2015 12:36:12 +0000 (7 14:36 +0200) | ||
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | |
| Tue, 7 Apr 2015 12:36:12 +0000 (7 14:36 +0200) | ||
| tree | 19a9765cf5560b62028e26b5014c61af29c96f1f | treesnapshot (tar.gz zip) |
| parent | ccc2e36bc531b1c8c156ab5675e023206b74f25d | commitdiff |
Fix incorrectly resolved merge conflict
aot-compiler was incorrectly removed from net_4_5_SUBDIRS in ccc2e36bc531b1c8c156ab5675e023206b74f25d, it should still be there in mono-4.0.0-branch (it was moved to net_4_5_PARALLEL_SUBDIRS in 3ceb869495df9e6648d606c64620441d3180cfdb later on).
aot-compiler was incorrectly removed from net_4_5_SUBDIRS in ccc2e36bc531b1c8c156ab5675e023206b74f25d, it should still be there in mono-4.0.0-branch (it was moved to net_4_5_PARALLEL_SUBDIRS in 3ceb869495df9e6648d606c64620441d3180cfdb later on).
| mcs/class/Makefile | diffblobblamehistory |