Diffusion Project3PCSC_LT 37b7dace9c61

fixing conflicts
37b7dace9c61
Actions

Authored by trebaol on Dec 10 2018, 11:30.

Description

fixing conflicts

Details

Committed

trebaol

Dec 10 2018, 11:30

Pushed

trebaol

Dec 10 2018, 11:30

Parents

R7913:c22492eaa1db: trying to fix git conflict

Branches

Unknown

Tags

Unknown

Event Timeline

trebaol committed R7913:37b7dace9c61: fixing conflicts (authored by trebaol).Dec 10 2018, 11:30

Changes (59)

				Path
	M			.DS_Store
	M			BacASable/.idea/workspace.xml
	M			BacASable/AbstractOdeSolver.cpp
	M			BacASable/AbstractOdeSolver.hpp
	D			BacASable/AbstractRightHandSide.cpp
	M			BacASable/AbstractRightHandSide.hpp
	M			BacASable/AdamsBashforth.cpp
	M			BacASable/AdamsBashforth.hpp
	M			BacASable/BackwardEuler.cpp
	M			BacASable/BackwardEuler.hpp
	M			BacASable/CMakeLists.txt
	M			BacASable/ForwardEuler.cpp
	M			BacASable/ForwardEuler.hpp
	M			BacASable/LinearY.hpp
	M			BacASable/RungeKutta.cpp
	M			BacASable/RungeKutta.hpp
	M			BacASable/Sinus.hpp
	M			BacASable/TimePolynomial.hpp
	M			BacASable/cmake-build-debug/BacASable
	M			BacASable/cmake-build-debug/BacASable.cbp
	M			BacASable/cmake-build-debug/CMakeFiles/BacASable.dir/AbstractOdeSolver.cpp.o
	M			BacASable/cmake-build-debug/CMakeFiles/BacASable.dir/AdamsBashforth.cpp.o
	M			BacASable/cmake-build-debug/CMakeFiles/BacASable.dir/BackwardEuler.cpp.o
	M			BacASable/cmake-build-debug/CMakeFiles/BacASable.dir/CXX.includecache
	M			BacASable/cmake-build-debug/CMakeFiles/BacASable.dir/DependInfo.cmake
	M			BacASable/cmake-build-debug/CMakeFiles/BacASable.dir/ForwardEuler.cpp.o
	D			BacASable/cmake-build-debug/CMakeFiles/BacASable.dir/GeneralFunctions.cpp.o
	M			BacASable/cmake-build-debug/CMakeFiles/BacASable.dir/LinearY.cpp.o
	M			BacASable/cmake-build-debug/CMakeFiles/BacASable.dir/RungeKutta.cpp.o
	M			BacASable/cmake-build-debug/CMakeFiles/BacASable.dir/Sinus.cpp.o
	M			BacASable/cmake-build-debug/CMakeFiles/BacASable.dir/TimePolynomial.cpp.o
	M			BacASable/cmake-build-debug/CMakeFiles/BacASable.dir/build.make
	M			BacASable/cmake-build-debug/CMakeFiles/BacASable.dir/cmake_clean.cmake
	M			BacASable/cmake-build-debug/CMakeFiles/BacASable.dir/depend.internal
	M			BacASable/cmake-build-debug/CMakeFiles/BacASable.dir/depend.make
	M			BacASable/cmake-build-debug/CMakeFiles/BacASable.dir/link.txt
	M			BacASable/cmake-build-debug/CMakeFiles/BacASable.dir/main.cpp.o
	M			BacASable/cmake-build-debug/CMakeFiles/BacASable.dir/progress.make
	M			BacASable/cmake-build-debug/CMakeFiles/Makefile2
	M			BacASable/cmake-build-debug/CMakeFiles/progress.marks
	M			BacASable/cmake-build-debug/Makefile
	M			BacASable/main.cpp
	M			html/_abstract_ode_solver_8hpp_source.html
	M			html/_backward_euler_8hpp_source.html
	M			html/class_abstract_ode_solver-members.html
	M			html/class_abstract_ode_solver.html
	M			html/class_adams_bashforth.html
	M			html/class_backward_euler.html
	M			html/class_forward_euler.html
	M			html/class_runge_kutta.html
	M			html/functions.html
	M			html/functions_func.html
	M			html/search/all_7.js
	M			html/search/functions_3.js
	M			latex/class_abstract_ode_solver.tex
	M			latex/class_adams_bashforth.tex
	M			latex/class_backward_euler.tex
	M			latex/class_forward_euler.tex
	M			latex/class_runge_kutta.tex