Commits

Juha Komulainen  committed 016ccfe

Updated to Kotlin-version.

  • Participants
  • Parent commits 9ee55e2
  • Branches kotlin

Comments (0)

Files changed (5)

+.DS_Store
+out
+.idea/workspace.xml
+*~

File .hgignore

-syntax: glob
-
-.DS_Store
-out
-.idea/uiDesigner.xml
-.idea/workspace.xml
-.idea/dictionaries
-.idea/ant.xml
-*~

File .idea/runConfigurations/threed.xml

 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="threed" type="JetRunConfigurationType" factoryName="Kotlin">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="threed.namespace" />
+    <option name="MAIN_CLASS_NAME" value="threed.ThreedPackage" />
     <option name="VM_PARAMETERS" value="-Djava.library.path=libs/native/macosx" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="" />
     <option name="PASS_PARENT_ENVS" value="true" />
     <module name="threed" />
     <envs />
+    <RunnerSettings RunnerId="JRebel Debug">
+      <option name="bootstrapPath" />
+      <option name="debugPort" value="" />
+      <option name="jrebelArgs" />
+      <option name="loggingEnabled" value="false" />
+      <option name="transport" value="0" />
+      <option name="useBootstrapDefaults" value="true" />
+      <option name="DEBUG_PORT" value="" />
+      <option name="TRANSPORT" value="0" />
+      <option name="LOCAL" value="true" />
+    </RunnerSettings>
     <RunnerSettings RunnerId="Run" />
     <ConfigurationWrapper RunnerId="Run" />
     <method />

File annotations/org/lwjgl/opengl/annotations.xml

+<?xml version="1.0" encoding="UTF-8"?>
 <root>
-    <item name='org.lwjgl.opengl.GL20 java.lang.String glGetProgramInfoLog(int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.lwjgl.opengl.GL20 java.lang.String glGetShaderInfoLog(int, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.lwjgl.opengl.Display org.lwjgl.opengl.DisplayMode getDisplayMode()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.lwjgl.opengl.Display void setDisplayModeAndFullscreen(org.lwjgl.opengl.DisplayMode) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
+  <item name="org.lwjgl.opengl.Display org.lwjgl.opengl.DisplayMode getDisplayMode()">
+    <annotation name="org.jetbrains.annotations.NotNull" />
+  </item>
+  <item name="org.lwjgl.opengl.Display void setDisplayModeAndFullscreen(org.lwjgl.opengl.DisplayMode) 0">
+    <annotation name="org.jetbrains.annotations.NotNull" />
+  </item>
+  <item name="org.lwjgl.opengl.GL20 java.lang.String glGetProgramInfoLog(int, int)">
+    <annotation name="org.jetbrains.annotations.NotNull" />
+  </item>
+  <item name="org.lwjgl.opengl.GL20 java.lang.String glGetShaderInfoLog(int, int)">
+    <annotation name="org.jetbrains.annotations.NotNull" />
+  </item>
 </root>
+

File lib/kotlin-runtime.jar

Binary file modified.