Commit e9703e40 authored by Ciliste's avatar Ciliste
Browse files

Merge remote-tracking branch 'origin/multi'

parents bbe2fd69 647589ae

jeuAssemblage/.idea/.gitignore

0 → 100644
+8 −0
Changes for jeuAssemblage/.idea/.gitignore: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line 
# Default ignored files

/shelf/

/workspace.xml

# Editor-based HTTP Client requests

/httpRequests/

# Datasource local storage ignored files

/dataSources/

/dataSources.local.xml

jeuAssemblage/.idea/ant.xml

0 → 100644
+6 −0
Changes for jeuAssemblage/.idea/ant.xml: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="AntConfiguration">

    <buildFile url="file://$PROJECT_DIR$/build.xml" />

  </component>

</project>
 
 No newline at end of file

jeuAssemblage/.idea/libraries/jeuAssemblage_0_1.xml

0 → 100644
+9 −0
Changes for jeuAssemblage/.idea/libraries/jeuAssemblage_0_1.xml: 9 added lines, 0 removed lines.
Original line number Diff line number Diff line 
<component name="libraryTable">

  <library name="jeuAssemblage-0.1">

    <CLASSES>

      <root url="jar://$PROJECT_DIR$/dist/jeuAssemblage-0.1.jar!/" />

    </CLASSES>

    <JAVADOC />

    <SOURCES />

  </library>

</component>
 
 No newline at end of file

jeuAssemblage/.idea/libraries/lib.xml

0 → 100644
+16 −0
Changes for jeuAssemblage/.idea/libraries/lib.xml: 16 added lines, 0 removed lines.
Original line number Diff line number Diff line 
<component name="libraryTable">

  <library name="lib">

    <CLASSES>

      <root url="jar://$PROJECT_DIR$/lib/flatlaf-2.6.jar!/" />

      <root url="jar://$PROJECT_DIR$/lib/kryo-2.24.0.jar!/" />

      <root url="jar://$PROJECT_DIR$/lib/objenesis-2.1.jar!/" />

      <root url="jar://$PROJECT_DIR$/lib/jdom-2.0.6.jar!/" />

      <root url="jar://$PROJECT_DIR$/lib/jsonbeans-0.7.jar!/" />

      <root url="jar://$PROJECT_DIR$/lib/minlog-1.2.jar!/" />

      <root url="jar://$PROJECT_DIR$/lib/kryonet-2.22.0-RC1.jar!/" />

      <root url="jar://$PROJECT_DIR$/lib/pieces_puzzle-0.1.0.jar!/" />

    </CLASSES>

    <JAVADOC />

    <SOURCES />

  </library>

</component>
 
 No newline at end of file

jeuAssemblage/.idea/libraries/lib1.xml

0 → 100644
+10 −0
Changes for jeuAssemblage/.idea/libraries/lib1.xml: 10 added lines, 0 removed lines.
Original line number Diff line number Diff line 
<component name="libraryTable">

  <library name="lib1">

    <CLASSES>

      <root url="jar://$PROJECT_DIR$/dist/lib/flatlaf-2.6.jar!/" />

      <root url="jar://$PROJECT_DIR$/dist/lib/pieces_puzzle-0.1.0.jar!/" />

    </CLASSES>

    <JAVADOC />

    <SOURCES />

  </library>

</component>
 
 No newline at end of file