Merge remote-tracking branch 'origin/main'

# Conflicts: # .idea/editor.xml # .idea/misc.xml
2025-10-20 14:59:16 +02:00 · 2025-10-20 14:59:16 +02:00 · 50533a4c86
commit 50533a4c86
parent 0db585f97d 97d38f5a73
3 changed files with 1 additions and 3 deletions
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -4,12 +4,10 @@
  <component name="MakefileSettings">
    <option name="linkedExternalProjectsSettings">
      <MakefileProjectSettings>
-        <option name="externalProjectPath" value="$PROJECT_DIR$/Start_Mac" />
        <option name="version" value="2" />
      </MakefileProjectSettings>
    </option>
  </component>
-  <component name="MakefileWorkspace" PROJECT_DIR="$PROJECT_DIR$/Start_Mac">
    <contentRoot DIR="$PROJECT_DIR$" />
  </component>
 </project>
--- a/Start_Windows/words.txt
+++ b/Start_Windows/words.txt
@ -2,4 +2,4 @@ Yeti,Nessie Werwolf; Vampir
 Monster
 Hydra;Frankenstein
 Dracula;KingKong;Gremlin;Kobold,Hexe;Poltergeist
-Gespenst, Oger
+Gespenst, Ogerp
--- a/Start_Windows/wordsalad_initial.exe
+++ b/Start_Windows/wordsalad_initial.exe