modified:   Makefile
	modified:   body1.txt
	modified:   launcher.py
	modified:   plotter
	modified:   src/Body.cpp
	modified:   src/Body.h
	modified:   src/Node.cpp
	modified:   src/Node.h
	modified:   src/NumMethod.cpp
	modified:   src/NumMethod.h
	modified:   src/Parser.cpp
	modified:   src/Parser.h
Merge branch 'master' of https://github.com/cranon/gcm-1d

Conflicts:
	Makefile
	body1.txt
	body1.txt~
	plotter
	src/Body.cpp
	src/NumMethod.cpp
	src/NumMethod.h
	new file:   .gitignore
	deleted:    body1.txt~
	deleted:    data/Body_1_Step_0.txt
	deleted:    data/Body_1_Step_1.txt
	deleted:    data/Body_1_Step_10.txt
	deleted:    data/Body_1_Step_100.txt
	deleted:    data/Body_1_Step_11.txt
	deleted:    data/Body_1_Step_12.txt
	deleted:    data/Body_1_Step_13.txt
	deleted:    data/Body_1_Step_14.txt
	deleted:    data/Body_1_Step_15.txt
	deleted:    data/Body_1_Step_16.txt
	deleted:    data/Body_1_Step_17.txt
	deleted:    data/Body_1_Step_18.txt
	deleted:    data/Body_1_Step_19.txt
	deleted:    data/Body_1_Step_2.txt
	deleted:    data/Body_1_Step_20.txt
	deleted:    data/Body_1_Step_21.txt
	deleted:    data/Body_1_Step_22.txt
	deleted:    data/Body_1_Step_23.txt
	deleted:    data/Body_1_Step_24.txt
	deleted:    data/Body_1_Step_25.txt
	deleted:    data/Body_1_Step_26.txt
	deleted:    data/Body_1_Step_27.txt
	deleted:    data/Body_1_Step_28.txt
	deleted:    data/Body_1_Step_29.txt
	deleted:    data/Body_1_Step_3.txt
	deleted:    data/Body_1_Step_30.txt
	deleted:    data/Body_1_Step_31.txt
	deleted:    data/Body_1_Step_32.txt
	deleted:    data/Body_1_Step_33.txt
	deleted:    data/Body_1_Step_34.txt
	deleted:    data/Body_1_Step_35.txt
	deleted:    data/Body_1_Step_36.txt
	deleted:    data/Body_1_Step_37.txt
	deleted:    data/Body_1_Step_38.txt
	deleted:    data/Body_1_Step_39.txt
	deleted:    data/Body_1_Step_4.txt
	deleted:    data/Body_1_Step_40.txt
	deleted:    data/Body_1_Step_41.txt
	deleted:    data/Body_1_Step_42.txt
	deleted:    data/Body_1_Step_43.txt
	deleted:    data/Body_1_Step_44.txt
	deleted:    data/Body_1_Step_45.txt
	deleted:    data/Body_1_Step_46.txt
	deleted:    data/Body_1_Step_47.txt
	deleted:    data/Body_1_Step_48.txt
	deleted:    data/Body_1_Step_49.txt
	deleted:    data/Body_1_Step_5.txt
	deleted:    data/Body_1_Step_50.txt
	deleted:    data/Body_1_Step_51.txt
	deleted:    data/Body_1_Step_52.txt
	deleted:    data/Body_1_Step_53.txt
	deleted:    data/Body_1_Step_54.txt
	deleted:    data/Body_1_Step_55.txt
	deleted:    data/Body_1_Step_56.txt
	deleted:    data/Body_1_Step_57.txt
	deleted:    data/Body_1_Step_58.txt
	deleted:    data/Body_1_Step_59.txt
	deleted:    data/Body_1_Step_6.txt
	deleted:    data/Body_1_Step_60.txt
	deleted:    data/Body_1_Step_61.txt
	deleted:    data/Body_1_Step_62.txt
	deleted:    data/Body_1_Step_63.txt
	deleted:    data/Body_1_Step_64.txt
	deleted:    data/Body_1_Step_65.txt
	deleted:    data/Body_1_Step_66.txt
	deleted:    data/Body_1_Step_67.txt
	deleted:    data/Body_1_Step_68.txt
	deleted:    data/Body_1_Step_69.txt
	deleted:    data/Body_1_Step_7.txt
	deleted:    data/Body_1_Step_70.txt
	deleted:    data/Body_1_Step_71.txt
	deleted:    data/Body_1_Step_72.txt
	deleted:    data/Body_1_Step_73.txt
	deleted:    data/Body_1_Step_74.txt
	deleted:    data/Body_1_Step_75.txt
	deleted:    data/Body_1_Step_76.txt
	deleted:    data/Body_1_Step_77.txt
	deleted:    data/Body_1_Step_78.txt
	deleted:    data/Body_1_Step_79.txt
	deleted:    data/Body_1_Step_8.txt
	deleted:    data/Body_1_Step_80.txt
	deleted:    data/Body_1_Step_81.txt
	deleted:    data/Body_1_Step_82.txt
	deleted:    data/Body_1_Step_83.txt
	deleted:    data/Body_1_Step_84.txt
	deleted:    data/Body_1_Step_85.txt
	deleted:    data/Body_1_Step_86.txt
	deleted:    data/Body_1_Step_87.txt
	deleted:    data/Body_1_Step_88.txt
	deleted:    data/Body_1_Step_89.txt
	deleted:    data/Body_1_Step_9.txt
	deleted:    data/Body_1_Step_90.txt
	deleted:    data/Body_1_Step_91.txt
	deleted:    data/Body_1_Step_92.txt
	deleted:    data/Body_1_Step_93.txt
	deleted:    data/Body_1_Step_94.txt
	deleted:    data/Body_1_Step_95.txt
	deleted:    data/Body_1_Step_96.txt
	deleted:    data/Body_1_Step_97.txt
	deleted:    data/Body_1_Step_98.txt
	deleted:    data/Body_1_Step_99.txt
	deleted:    data/plots/Plot_0.jpeg
	deleted:    data/plots/Plot_1.jpeg
	deleted:    data/plots/Plot_10.jpeg
	deleted:    data/plots/Plot_100.jpeg
	deleted:    data/plots/Plot_11.jpeg
	deleted:    data/plots/Plot_12.jpeg
	deleted:    data/plots/Plot_13.jpeg
	deleted:    data/plots/Plot_14.jpeg
	deleted:    data/plots/Plot_15.jpeg
	deleted:    data/plots/Plot_16.jpeg
	deleted:    data/plots/Plot_17.jpeg
	deleted:    data/plots/Plot_18.jpeg
	deleted:    data/plots/Plot_19.jpeg
	deleted:    data/plots/Plot_2.jpeg
	deleted:    data/plots/Plot_20.jpeg
	deleted:    data/plots/Plot_21.jpeg
	deleted:    data/plots/Plot_22.jpeg
	deleted:    data/plots/Plot_23.jpeg
	deleted:    data/plots/Plot_24.jpeg
	deleted:    data/plots/Plot_25.jpeg
	deleted:    data/plots/Plot_26.jpeg
	deleted:    data/plots/Plot_27.jpeg
	deleted:    data/plots/Plot_28.jpeg
	deleted:    data/plots/Plot_29.jpeg
	deleted:    data/plots/Plot_3.jpeg
	deleted:    data/plots/Plot_30.jpeg
	deleted:    data/plots/Plot_31.jpeg
	deleted:    data/plots/Plot_32.jpeg
	deleted:    data/plots/Plot_33.jpeg
	deleted:    data/plots/Plot_34.jpeg
	deleted:    data/plots/Plot_35.jpeg
	deleted:    data/plots/Plot_36.jpeg
	deleted:    data/plots/Plot_37.jpeg
	deleted:    data/plots/Plot_38.jpeg
	deleted:    data/plots/Plot_39.jpeg
	deleted:    data/plots/Plot_4.jpeg
	deleted:    data/plots/Plot_40.jpeg
	deleted:    data/plots/Plot_41.jpeg
	deleted:    data/plots/Plot_42.jpeg
	deleted:    data/plots/Plot_43.jpeg
	deleted:    data/plots/Plot_44.jpeg
	deleted:    data/plots/Plot_45.jpeg
	deleted:    data/plots/Plot_46.jpeg
	deleted:    data/plots/Plot_47.jpeg
	deleted:    data/plots/Plot_48.jpeg
	deleted:    data/plots/Plot_49.jpeg
	deleted:    data/plots/Plot_5.jpeg
	deleted:    data/plots/Plot_50.jpeg
	deleted:    data/plots/Plot_51.jpeg
	deleted:    data/plots/Plot_52.jpeg
	deleted:    data/plots/Plot_53.jpeg
	deleted:    data/plots/Plot_54.jpeg
	deleted:    data/plots/Plot_55.jpeg
	deleted:    data/plots/Plot_56.jpeg
	deleted:    data/plots/Plot_57.jpeg
	deleted:    data/plots/Plot_58.jpeg
	deleted:    data/plots/Plot_59.jpeg
	deleted:    data/plots/Plot_6.jpeg
	deleted:    data/plots/Plot_60.jpeg
	deleted:    data/plots/Plot_61.jpeg
	deleted:    data/plots/Plot_62.jpeg
	deleted:    data/plots/Plot_63.jpeg
	deleted:    data/plots/Plot_64.jpeg
	deleted:    data/plots/Plot_65.jpeg
	deleted:    data/plots/Plot_66.jpeg
	deleted:    data/plots/Plot_67.jpeg
	deleted:    data/plots/Plot_68.jpeg
	deleted:    data/plots/Plot_69.jpeg
	deleted:    data/plots/Plot_7.jpeg
	deleted:    data/plots/Plot_70.jpeg
	deleted:    data/plots/Plot_71.jpeg
	deleted:    data/plots/Plot_72.jpeg
	deleted:    data/plots/Plot_73.jpeg
	deleted:    data/plots/Plot_74.jpeg
	deleted:    data/plots/Plot_75.jpeg
	deleted:    data/plots/Plot_76.jpeg
	deleted:    data/plots/Plot_77.jpeg
	deleted:    data/plots/Plot_78.jpeg
	deleted:    data/plots/Plot_79.jpeg
	deleted:    data/plots/Plot_8.jpeg
	deleted:    data/plots/Plot_80.jpeg
	deleted:    data/plots/Plot_81.jpeg
	deleted:    data/plots/Plot_82.jpeg
	deleted:    data/plots/Plot_83.jpeg
	deleted:    data/plots/Plot_84.jpeg
	deleted:    data/plots/Plot_85.jpeg
	deleted:    data/plots/Plot_86.jpeg
	deleted:    data/plots/Plot_87.jpeg
	deleted:    data/plots/Plot_88.jpeg
	deleted:    data/plots/Plot_89.jpeg
	deleted:    data/plots/Plot_9.jpeg
	deleted:    data/plots/Plot_90.jpeg
	deleted:    data/plots/Plot_91.jpeg
	deleted:    data/plots/Plot_92.jpeg
	deleted:    data/plots/Plot_93.jpeg
	deleted:    data/plots/Plot_94.jpeg
	deleted:    data/plots/Plot_95.jpeg
	deleted:    data/plots/Plot_96.jpeg
	deleted:    data/plots/Plot_97.jpeg
	deleted:    data/plots/Plot_98.jpeg
	deleted:    data/plots/Plot_99.jpeg
	deleted:    nbproject/ISOM-old
	deleted:    nbproject/configurations.xml
	deleted:    nbproject/private/Default.properties
	deleted:    nbproject/private/configurations.xml
	deleted:    nbproject/private/private.xml
	deleted:    nbproject/project.xml
	deleted:    run
	deleted:    src/Body.o
	deleted:    src/Mesh.o
	deleted:    src/Node.o
	deleted:    src/NumMethod.o
	deleted:    src/Parser.o
	deleted:    src/Scene.o
	deleted:    video.avi
	modified:   body1.txt
	modified:   plotter
	modified:   src/Body.cpp
	deleted:    src/NumMethod.cpp
	deleted:    src/NumMethod.h
	modified:   src/calculators/NumMethod.cpp
	modified:   src/calculators/NumMethod.h
	modified:   .gitignore
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore

	изменён:   Makefile
	изменён:   body1.txt
	изменён:   plotter
	удалён:    run
	изменён:   src/Body.cpp
	изменён:   src/Body.h
	изменён:   src/Node.cpp
	изменён:   src/Node.h
	изменён:   src/Parser.cpp
	изменён:   src/Parser.h
	изменён:   src/calculators/NumMethod.cpp
	изменён:   src/calculators/NumMethod.h