Commit Graph
16 Commits
Author SHA1 Message Date
guballaro99746 09ec5b288e Merge remote-tracking branch 'refs/remotes/origin/project_tests'
# Conflicts:
#	CMakeLists.txt
#	cmake-build-debug/CMakeFiles/3.30.5/CMakeDetermineCompilerABI_C.bin
#	cmake-build-debug/CMakeFiles/3.30.5/CMakeDetermineCompilerABI_CXX.bin
#	cmake-build-debug/CMakeFiles/3.30.5/CompilerIdC/a.exe
#	cmake-build-debug/CMakeFiles/3.30.5/CompilerIdCXX/a.exe
#	cmake-build-debug/CMakeFiles/CMakeConfigureLog.yaml
#	cmake-build-debug/CMakeFiles/clion-Debug-log.txt
#	cmake-build-debug/Prog3B.exe
#	cmake-build-debug/Testing/Temporary/LastTest.log
#	cmake-build-debug/compile_commands.json
2025-11-17 13:14:48 +01:00
guballaro99746 c72b95036d Kurz vor Finale 2025-11-17 13:12:52 +01:00
guballaro99746 3625bf2506 Merge remote-tracking branch 'origin/project_developer' 2025-11-17 13:12:07 +01:00
guballaro99746 1ff4c9397c Merge branch 'architect'
# Conflicts:
#	cmake-build-debug/CMakeFiles/Prog3B.dir/gamecube.cpp.obj
#	cmake-build-debug/CMakeFiles/Prog3B.dir/main.cpp.obj
#	cmake-build-debug/Prog3B.exe
#	cmake-build-debug/Testing/Temporary/LastTest.log
2025-11-17 13:11:47 +01:00
guballaro99746 27ea219f41 Backup 2025-11-16 17:57:29 +01:00
guballaro99746 42649ea0db ANFORDERUNGEN 2025-11-03 15:16:26 +01:00
guballaro99746 fd43435619 Merge branch 'main' of https://git.efi.th-nuernberg.de/gitea/guballaro99746/Stone_Development into project_leader 2025-11-03 14:52:54 +01:00
guballaro99746 6855f5fd28 Requirements 2025-11-03 14:40:16 +01:00
guballaro99746 1a1f0d56cd Requirements 2025-11-03 14:38:43 +01:00
guballaro99746 e2c87dddb9 Merge branch 'main' of https://git.efi.th-nuernberg.de/gitea/guballaro99746/Stone_Development 2025-11-03 14:23:37 +01:00
guballaro99746 ffc126599c Update 2025-11-03 14:21:48 +01:00
guballaro99746 b6b1bd63a9 SEHR WICHTIG git add motivation.txt! 2025-10-21 09:03:10 +02:00
guballaro99746 5c94d3dcff Hallo ROBEROTÈOR 2025-10-21 08:37:06 +02:00
guballaro99746 c08842ce86 Hallo MEINE NAME IST ROBERTO 2025-10-21 08:35:45 +02:00
guballaro99746 f8539d4732 Hallo hier ist Robert Kommentar 2025-10-20 15:13:25 +02:00
guballaro99746 8df865b8da Initialer Commit für Programmieren 3B 2025-10-20 14:52:50 +02:00