stammjo100588/Info2Praktikum
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	.idea/editor.xml
#	.idea/misc.xml
This commit is contained in:
kegelmannni100026
2025-10-20 14:59:16 +02:00
parent 0db585f97d 97d38f5a73
commit 50533a4c86
3 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/misc.xml
Generated
-2
View File
@@ -4,12 +4,10 @@
<component name="MakefileSettings"> <component name="MakefileSettings">
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<MakefileProjectSettings> <MakefileProjectSettings>
<option name="externalProjectPath" value="$PROJECT_DIR$/Start_Mac" />
<option name="version" value="2" /> <option name="version" value="2" />
</MakefileProjectSettings> </MakefileProjectSettings>
</option> </option>
</component> </component>
<component name="MakefileWorkspace" PROJECT_DIR="$PROJECT_DIR$/Start_Mac">
<contentRoot DIR="$PROJECT_DIR$" /> <contentRoot DIR="$PROJECT_DIR$" />
</component> </component>
</project> </project>
Start_Windows/words.txt
+1 -1
View File
@@ -2,4 +2,4 @@ Yeti,Nessie Werwolf; Vampir
Monster Monster
Hydra;Frankenstein Hydra;Frankenstein
Dracula;KingKong;Gremlin;Kobold,Hexe;Poltergeist Dracula;KingKong;Gremlin;Kobold,Hexe;Poltergeist
Gespenst, Oger Gespenst, Ogerp
Start_Windows/wordsalad_initial.exe
BIN
View File
Binary file not shown.