diff options
| author | Iavor S. Diatchki <iavor.diatchki@gmail.com> | 2012-03-13 22:15:11 -0700 |
|---|---|---|
| committer | Iavor S. Diatchki <iavor.diatchki@gmail.com> | 2012-03-13 22:15:11 -0700 |
| commit | 1dd9b1ae1a5994a78ec1c4ca18c8df6e5b2ca9e0 (patch) | |
| tree | 78e4df29214ffbb8076bd00183ab6fbf68e17ffb /mk | |
| parent | cfd89e12334e7dbcc8d9aaee898bcc38b77f549b (diff) | |
| parent | 93299cce9a4f7bc65b8164f779a37ef7f9f7c4a0 (diff) | |
| download | haskell-1dd9b1ae1a5994a78ec1c4ca18c8df6e5b2ca9e0.tar.gz | |
Merge remote-tracking branch 'origin/master' into type-nats
Conflicts:
compiler/coreSyn/CoreLint.lhs
compiler/deSugar/DsBinds.lhs
compiler/hsSyn/HsTypes.lhs
compiler/iface/IfaceType.lhs
compiler/rename/RnHsSyn.lhs
compiler/rename/RnTypes.lhs
compiler/stgSyn/StgLint.lhs
compiler/typecheck/TcHsType.lhs
compiler/utils/ListSetOps.lhs
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/tree.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mk/tree.mk b/mk/tree.mk index 8273d6766a..db14cf4127 100644 --- a/mk/tree.mk +++ b/mk/tree.mk @@ -52,7 +52,7 @@ INPLACE_PERL = $(INPLACE)/perl # ################################################################################ -BIN_DIST_INST_SUBDIR = "install dir" +BIN_DIST_INST_SUBDIR = "install dir" BIN_DIST_INST_DIR = bindisttest/$(BIN_DIST_INST_SUBDIR) ################################################################################ |