Skip to content

Unify darcs history and master #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Jan 24, 2015
Merged

Unify darcs history and master #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
b53012d
Tailorization
Feb 19, 2008
bda8ea3
stuff from last week
Mar 6, 2008
bf27952
2/3 rewards; function restructuring; new models: Q, QSA, doors
Mar 20, 2008
c4b15ac
cleanup some warnings and docs
Jul 6, 2008
536fe0c
cabal fields for hackage
Jul 6, 2008
df124ac
added test suite for runtime and engine
dylex Jul 7, 2008
5ce2c0d
refix 7.5 library creation
dylex Jul 8, 2008
b12cc31
module documentation reference fixes
dylex Nov 2, 2008
4f250f7
update for cabal 1.6
dylex Nov 2, 2008
d3e6aea
new cabal version 1.6, submitting
dylex Nov 16, 2008
e897810
adding missing test/src files
dylex Nov 16, 2008
72db872
minor cleanup
dylex Dec 18, 2009
6128d8b
cleanup warnings
dylex Dec 3, 2010
3b12011
explicit base 4.* dependency
dylex Jun 14, 2011
fad5d29
bump version to 0.1.1, restrict cabal version for now
dylex Oct 17, 2011
e0f68c3
add darcs hub repo
dylex Aug 27, 2014
a6adb16
Merge commit 'e53d10371d43ebb8b2d2d62a70851eecf500aaf5' into unify
dylex Jan 23, 2015
d823003
Merge branch 'master' into unify
dylex Jan 23, 2015
a3832ea
Remove configure.ac, no longer used
dylex Jan 23, 2015
46eb606
Merge remote-tracking branch 'origin/darcs' into unify
dylex Jan 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Foreign/Matlab/Internal.hsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ module Foreign.Matlab.Internal (
MNull, mNullArray, isMNull,
MCell(..),
MStruct(..),
MFun,
MXFun, MFun,
MWSize, MWIndex, MWSignedIndex
) where

Expand Down
1 change: 0 additions & 1 deletion Foreign/Matlab/Runtime.hsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import System.FilePath (splitFileName, dropExtensions, extSeparator
, (<.>), (</>))
import Foreign.Matlab.Util
import Foreign.Matlab.Internal

import System.IO.Unsafe (unsafePerformIO)

#include "hsc_sym.h"
Expand Down
2 changes: 1 addition & 1 deletion Foreign/Matlab/Runtime/Generic.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ mlGenericSetVar :: MLGeneric -> String -> MXArray a -> IO ()
mlGenericSetVar mlg v x = do
b <- createRowVector "base"
v <- createRowVector v
_ <- mlGenericFun mlg "assignin" [anyMXArray b,anyMXArray v,anyMXArray x] 0
[] <- mlGenericFun mlg "assignin" [anyMXArray b,anyMXArray v,anyMXArray x] 0
freeMXArray v
freeMXArray b

Expand Down