Attempt to merge SVN 2824
authorjpritikin <jpritikin@df83fd30-4cca-4c36-ab9d-e8b5583ccbd1>
Sat, 10 Aug 2013 05:27:45 +0000 (05:27 +0000)
committerjpritikin <jpritikin@df83fd30-4cca-4c36-ab9d-e8b5583ccbd1>
Sat, 10 Aug 2013 05:27:45 +0000 (05:27 +0000)
commita37a0a6052ef7e35231cf97e797d8c98f3d30d57
tree7b822aa03231e908cc021a2b96502f1dc48f0a12
parentb00d41fed6e2aeeb44dcad69328b9304536d74ca
Attempt to merge SVN 2824

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@2828 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1
src/matrix.cpp
src/matrix.h
src/omxCsolnp.cpp
src/omxCsolnp.h
src/subnp.cpp
src/subnp.h [deleted file]
src/types.h