[mathicgb] 175/393: merge

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch upstream
in repository mathicgb.

commit 9027e59ca71d5553ca0139ad661b495b894c14a5
Merge: 968d699 4fbf785
Author: Bjarke Hammersholt Roune <bjarkehr.code at gmail.com>
Date:   Mon Feb 18 17:37:15 2013 +0100

    merge

 Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc Makefile.am
index 9a2af76,5addb86..566d38c
--- a/Makefile.am
+++ b/Makefile.am
@@@ -66,9 -66,9 +66,9 @@@ libmathicgb_la_SOURCES = src/mathicgb/B
    src/mathicgb/CFile.cpp src/mathicgb/LogDomain.hpp			\
    src/mathicgb/LogDomain.cpp src/mathicgb/LogDomainSet.hpp \
    src/mathicgb/F4MatrixBuilder2.hpp src/mathicgb/F4MatrixBuilder2.cpp \
-   src/mathicgb/LogDomainSet.cpp src/mathicgb/ProtoMatrix.hpp \
-   src/mathicgb/ProtoMatrix.cpp src/mathicgb/F4MatrixProject.hpp \
+   src/mathicgb/LogDomainSet.cpp src/mathicgb/F4ProtoMatrix.hpp \
+   src/mathicgb/F4ProtoMatrix.cpp src/mathicgb/F4MatrixProject.hpp \
 -  src/mathicgb/F4MatrixProjection.cpp
 +  src/mathicgb/F4MatrixProjection.cpp src/mathicgb/ScopeExit.hpp
  
  # When making a distribution file, Automake knows to include all files
  # that are necessary to build the project. EXTRA_DIST specifies files

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mathicgb.git