Browse Source

changed some things

master
David 2 years ago
parent
commit
1e1626adb5
10 changed files with 3 additions and 83 deletions
  1. +0
    -0
      .idea/.name
  2. +2
    -2
      .idea/misc.xml
  3. +1
    -1
      .idea/modules.xml
  4. +0
    -0
      Mergesort.iml
  5. +0
    -6
      Mergesort/.idea/misc.xml
  6. +0
    -8
      Mergesort/.idea/modules.xml
  7. +0
    -66
      Mergesort/.idea/workspace.xml
  8. +0
    -0
      hallo/lul.txt
  9. +0
    -0
      out/production/Mergesort/Mergesort.class
  10. +0
    -0
      src/Mergesort.java

Mergesort/.idea/.name → .idea/.name View File


+ 2
- 2
.idea/misc.xml View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

+ 1
- 1
.idea/modules.xml View File

@@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/_Programme.iml" filepath="$PROJECT_DIR$/.idea/_Programme.iml" />
<module fileurl="file://$PROJECT_DIR$/Mergesort.iml" filepath="$PROJECT_DIR$/Mergesort.iml" />
</modules>
</component>
</project>

Mergesort/Mergesort.iml → Mergesort.iml View File


+ 0
- 6
Mergesort/.idea/misc.xml View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

+ 0
- 8
Mergesort/.idea/modules.xml View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/Mergesort.iml" filepath="$PROJECT_DIR$/Mergesort.iml" />
</modules>
</component>
</project>

+ 0
- 66
Mergesort/.idea/workspace.xml View File

@@ -1,66 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="c8adc784-126f-470a-a7fd-698c37d72caf" name="Default Changelist" comment="" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Class" />
</list>
</option>
</component>
<component name="ProjectId" id="1QzzoweBm11mFzbea31cckI8MbE" />
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="RunManager">
<configuration name="Mergesort" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="Mergesort" />
<module name="Mergesort" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<recent_temporary>
<list>
<item itemvalue="Application.Mergesort" />
</list>
</recent_temporary>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="c8adc784-126f-470a-a7fd-698c37d72caf" name="Default Changelist" comment="" />
<created>1568788391205</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1568788391205</updated>
<workItem from="1568788394064" duration="53000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
</project>

+ 0
- 0
hallo/lul.txt View File


Mergesort/out/production/Mergesort/Mergesort.class → out/production/Mergesort/Mergesort.class View File


Mergesort/src/Mergesort.java → src/Mergesort.java View File


Loading…
Cancel
Save