git.osdn.net Git - moflib/moflib.git/commit

author	tomohiro yasutomo <o_ggy@users.sourceforge.jp>
	Mon, 6 Sep 2010 02:55:26 +0000 (19:55 -0700)
committer	tomohiro yasutomo <o_ggy@users.sourceforge.jp>
	Mon, 6 Sep 2010 02:55:26 +0000 (19:55 -0700)
commit	6a86c988a3d8a83b7bd2b71b2ff956ecc3837003
tree	d18c5f73e04279438f18b60c6ac26d8521313c80	tree \| snapshot
parent	6e301c96024942018dfbda52ec1ea4437ac3cccb	commit \| diff

remove confliction

36 files changed:

bin/numeric		diff \| blob \| history
lib/libmofmath.a		diff \| blob \| history
lib/libmofutil.a		diff \| blob \| history
sample/build_unix/CMakeFiles/CMakeDirectoryInformation.cmake		diff \| blob \| history
sample/build_unix/numeric/CMakeFiles/CMakeDirectoryInformation.cmake		diff \| blob \| history
sample/build_unix/numeric/CMakeFiles/numeric.dir/flags.make		diff \| blob \| history
src/build_unix/Testing/Temporary/LastTest.log		diff \| blob \| history
src/build_unix/mof/math/CMakeFiles/CMakeDirectoryInformation.cmake		diff \| blob \| history
src/build_unix/mof/math/CMakeFiles/make_matrix_test.dir/flags.make		diff \| blob \| history
src/build_unix/mof/math/CMakeFiles/make_matrix_test.dir/link.txt		diff \| blob \| history
src/build_unix/mof/math/CMakeFiles/matrix2_test.dir/flags.make		diff \| blob \| history
src/build_unix/mof/math/CMakeFiles/matrix2_test.dir/link.txt		diff \| blob \| history
src/build_unix/mof/math/CMakeFiles/matrix3_test.dir/flags.make		diff \| blob \| history
src/build_unix/mof/math/CMakeFiles/matrix3_test.dir/link.txt		diff \| blob \| history
src/build_unix/mof/math/CMakeFiles/mofmath.dir/flags.make		diff \| blob \| history
src/build_unix/mof/math/CMakeFiles/vector2_test.dir/flags.make		diff \| blob \| history
src/build_unix/mof/math/CMakeFiles/vector2_test.dir/link.txt		diff \| blob \| history
src/build_unix/mof/math/CMakeFiles/vector3_test.dir/flags.make		diff \| blob \| history
src/build_unix/mof/math/CMakeFiles/vector3_test.dir/link.txt		diff \| blob \| history
src/build_unix/mof/util/CMakeFiles/CMakeDirectoryInformation.cmake		diff \| blob \| history
src/build_unix/mof/util/CMakeFiles/mofutil.dir/flags.make		diff \| blob \| history
src/mof/math/basic_matrix.hpp		diff \| blob \| history
src/mof/math/basic_matrix.hpp.orig	[new file with mode: 0644]	blob
src/mof/math/basic_vector.hpp		diff \| blob \| history
src/mof/math/basic_vector.hpp.orig	[new file with mode: 0644]	blob
src/mof/math/matrix2.hpp		diff \| blob \| history
src/mof/math/matrix2.hpp.orig	[new file with mode: 0644]	blob
src/mof/math/matrix3.hpp		diff \| blob \| history
src/mof/math/matrix3.hpp.orig	[new file with mode: 0644]	blob
src/mof/math/test/matrix3_test.cpp		diff \| blob \| history
src/mof/math/test/matrix3_test.cpp.orig	[new file with mode: 0644]	blob
src/mof/math/test/testbin/make_matrix_test		diff \| blob \| history
src/mof/math/test/testbin/matrix2_test		diff \| blob \| history
src/mof/math/test/testbin/matrix3_test		diff \| blob \| history
src/mof/math/test/testbin/vector2_test		diff \| blob \| history
src/mof/math/test/testbin/vector3_test		diff \| blob \| history

main開発

RSS Atom

About OSDN

Find Software

Develop Software

Help