Unify darcs history and master #3
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Import of the upstream sources from
Repository: svn+ssh://critic/home/lab/src
Kind: svn
Module: /dylan/hsmatlab
Revision: 35
darcs-hash:20080219162432-97e75-5955e801f5a558757000c784a1eb0da0298acdcd
darcs-hash:20080306165038-dd378-268343d00124df26d06ed7381e6a4cbd29cde4d0
darcs-hash:20080320164545-dd378-357702a2f753a26ce2884cb4cb888a62373e8b5c
darcs-hash:20080706201124-dd378-7eaa237d42b2368d40c8bd6dd56b51194fa3a44a
darcs-hash:20080706203137-dd378-9aa1dea55c84b5b428521e272f5393b041122275
fixed runtime support for matlab 7.6 darcs-hash:20080707210847-56c21-5e5c71053831ccf74c8be7aca894e2f9548a8292
recent 7.6 fixes broke 7.5 again: don't fail for old-style .ctf darcs-hash:20080708002215-56c21-aab42f7602d52247ade0cc873898e1718c45d160
darcs-hash:20081102045614-56c21-f97036bf9f568e6b19db42c49633d4ca04e723fb
darcs-hash:20081102073116-56c21-57827d86ebd0bfdab3e20893dc4a340e3a369e5f
darcs-hash:20081116010024-56c21-d09a8a849c1002e486989757d8b692c709a143ee
darcs-hash:20081116011415-56c21-5a6ae9f95fb315bd6a20a286230c6ca973b43d67
darcs-hash:20091218183348-56c21-2d3e10be78082d05fdc536fb238c52186e17bffb
Ignore-this: 2c02c206960fa647f94e83751794ad21 darcs-hash:20101203223030-56c21-6dc8e1ab1fab61f450a96802a373743309314a0e
Ignore-this: 4d6e714d2c4fec0e3e52231ba7442745 darcs-hash:20110614235606-56c21-686796eeaf710194df12f33b37d6b32bbc83a4c1
Ignore-this: 83ebd38db975459d0c5003b83732e86b darcs-hash:20111017165956-56c21-9a43932a0c8e73d30ee7f5440f99837f3591c592
Ignore-this: 9968dc18f1b1d98b968760b002e2dfbe darcs-hash:20140827125856-56c21-1662db45b2740b0d71ead6967d2b7f4f68e85435
Not much here, after the config removals Conflicts: Foreign/Matlab/Engine.hsc Foreign/Matlab/Runtime.hsc Foreign/Matlab/Runtime/Generic.hs configure.ac matlab.buildinfo.in matlab.cabal
|
Thanks for taking the time to unify your history with the changes I made! |
bmsherman
added a commit
that referenced
this pull request
Jan 24, 2015
Unify darcs history and master
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Only very minor changes here, as you can see, since most of my changes overlapped yours, though I haven't actually tried building. Main value is pulling in all the old history.