завершено слияние веток

main
Кристина Васильева 3 недель назад
Родитель 2bb350dc96 9ca17cef47
Сommit c56505bdec

@ -0,0 +1,50 @@
-----BEGIN OPENSSH PRIVATE KEY-----
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
e4+a76igZz1hpcAn99gF+PIHc=
-----END OPENSSH PRIVATE KEY-----

@ -0,0 +1 @@
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC7oAUhfHsoFrAsBWKyA9D8dPWWKuUFnsIi2+vJpeasp6GVZqyItYtFSuscEVRgiv9WcbP6wFrkKJgTN+GUifrQocMI8Lc86ilICktXm0qDbjMqZIXq0ekGmUre1Z+nVVw5cKgaZwyvdwfSm8lQ/mO5qUOKKUD+2DY6UuITaQRubUpOHRZsqmYLQ8fJYUjm/VhM2+kh3XoFIG72lbWCotI8PX9mBx+654Zz29HAvWZFbCKHTJhRIiXQnv6a4TYz+ZECxwOKk+zXBQS89bABbW+KnC5I8aRjrYpp+2BiRIzufT+ljbE3URZ7dsBdWAXHQi7iR7gic0gpQHSrjihz8WoBqvAkGSv3luQxXbRjzwnYpqjngxzPXYPWhWFi7O+fCjyKH+zj8KnpEq1dJ1TRVkI9BdkoDqF/DIxxSZq94c/fGfmSKWgJcMbSpCsfByuuM9IedSqSfBzxAISpXj6kngmtR+yDPCcPzl1wB0/RLc7Zjw55oziMJRBJFH1HEfZ6/8yxJrawWEFGAjqiaSqdjh/fsYHZVI+5oJVBOcBhDFdvqDA3QnkZvaVIgGAfmGdNKyQCglxRVgOKzhYhoNtxavxyzeWK6SIwSu2oyKfylzg+bwU/yArusKHcHwlLqZnPj93xYGZOp8AblK7P0FtaF3VO0qQedtX/uyMp7P8QIs837w== VasilyevaKS@mpei.ru

@ -11,6 +11,7 @@ int main() {
cin >> a >> b;
cout << "A + B = " << a + b << '\n';
cout << "A - B = " << a - b << '\n';
cout << "A : B = " << a / b << '\n';
return 0;
}

3
project/project/.gitignore поставляемый

@ -0,0 +1,3 @@
/bin
/obj
*.layout

@ -0,0 +1,18 @@
#include <iostream>
#include <vector>
#include <iomanip>
#include <limits>
using namespace std;
int main() {
cout << "Enter A and B: ";
int a, b;
cin >> a >> b;
cout << "A + B = " << a + b << '\n';
cout << "A - B = " << a - b << '\n';
return 0;
}

@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_project_file>
<FileVersion major="1" minor="6" />
<Project>
<Option title="project" />
<Option pch_mode="2" />
<Option compiler="gcc" />
<Build>
<Target title="Debug">
<Option output="bin/Debug/project" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/Debug/" />
<Option type="1" />
<Option compiler="gcc" />
<Compiler>
<Add option="-g" />
</Compiler>
</Target>
<Target title="Release">
<Option output="bin/Release/project" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/Release/" />
<Option type="1" />
<Option compiler="gcc" />
<Compiler>
<Add option="-O2" />
</Compiler>
<Linker>
<Add option="-s" />
</Linker>
</Target>
</Build>
<Compiler>
<Add option="-Wall" />
<Add option="-fexceptions" />
</Compiler>
<Unit filename="main.cpp">
<Option target="Debug" />
</Unit>
<Extensions>
<lib_finder disable_auto="1" />
</Extensions>
</Project>
</CodeBlocks_project_file>

@ -0,0 +1,90 @@
commit f593acd7c64584317a6eae389f372cb1205e0181 (HEAD -> main, origin/main, origin/HEAD)
Author: VasilyevaKS <VasilyevaKS@mpei.ru>
Date: Sun May 25 23:19:19 2025 +0300
добавлены изменения в файлы
project/Kristin.10 | 50 +++++++++++++++++++++++++++++++++++++++++++++
project/Kristin.10.pub | 1 +
project/README.md | 0
project/git | 0
project/main.cpp | 1 +
project/project/.gitignore | 3 +++
project/project/main.cpp | 18 ++++++++++++++++
project/project/project.cbp | 42 +++++++++++++++++++++++++++++++++++++
8 files changed, 115 insertions(+)
commit a9931e2aeff7234abaca8ea925f63a85aff523b4
Author: VasilyevaKS <VasilyevaKS@mpei.ru>
Date: Mon May 19 13:51:57 2025 +0300
Добавление SSH-ключей
Kristin.10 | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
Kristin.10.pub | 1 +
2 files changed, 51 insertions(+)
commit abe95ba092baa403d21617f4897118ea42c783b3
Author: VasilyevaKS <VasilyevaKS@mpei.ru>
Date: Mon May 19 13:14:14 2025 +0300
Добавлен файл README.md
README.md | 0
1 file changed, 0 insertions(+), 0 deletions(-)
commit 53bb8201479a2d4a5dc37372725980dc02f4cf30
Author: VasilyevaKS <VasilyevaKS@mpei.ru>
Date: Mon May 19 10:27:15 2025 +0300
Добавлен .gitignore
project/.gitignore | 3 +++
1 file changed, 3 insertions(+)
commit 7f40733b4b80a9bffb3413d8a506392fac98e2ef
Author: VasilyevaKS <VasilyevaKS@mpei.ru>
Date: Mon May 19 10:13:47 2025 +0300
Добавлен вывод разности a и b
project/main.cpp | 2 ++
1 file changed, 2 insertions(+)
commit c8de8070bcbe970b133bdb28344116f97f0c8e42
Author: VasilyevaKS <VasilyevaKS@mpei.ru>
Date: Mon May 19 10:11:12 2025 +0300
Добавлен вывод суммы a и b
project/main.cpp | 1 +
1 file changed, 1 insertion(+)
commit 933785b9d3abd96fffb5a7cb62d6b131c1123408
Author: VasilyevaKS <VasilyevaKS@mpei.ru>
Date: Mon May 19 10:08:21 2025 +0300
Изменено тело функции main() для ввода двух чисел
project/main.cpp | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
commit 571d0b4c7d34380e8d78cb8371b9e31b73e73e5d
Author: VasilyevaKS <VasilyevaKS@mpei.ru>
Date: Mon May 19 09:44:56 2025 +0300
build: добавлен файл проекта
project/project.layout | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 3cbe0b1cfdd40753aee10ff6d4f341f37c346986
Author: VasilyevaKS <VasilyevaKS@mpei.ru>
Date: Mon May 19 03:09:56 2025 +0300
code: заготовка программы
project/main.cpp | 20 ++++++++++++++++++++
project/project.cbp | 42 ++++++++++++++++++++++++++++++++++++++++++
project/project.layout | 10 ++++++++++
3 files changed, 72 insertions(+)
Загрузка…
Отмена
Сохранить