Commit 6414e96a authored by erreiip's avatar erreiip
Browse files

Revert "Deleted main branch to merge 2/2" 

This reverts commit 8eddcacd.
parent b2feeae9

.gitignore

0 → 100644
+14 −0
Changes for .gitignore: 14 added lines, 0 removed lines.
Original line number Diff line number Diff line 
/out/

/.idea/



jeuAssemblage/bin/*

jeuAssemblage/build/*

jeuAssemblage/dist/*

jeuAssemblage/jeuAssemblage.iml

jeuAssemblage/dist/*.jar



piece_puzzle/build/*

piece_puzzle/dist/*

piece_puzzle/piece_puzzle.iml



*.class
 
 No newline at end of file

.idea/.gitignore

0 → 100644
+8 −0
Changes for .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

.idea/JeuAssemblage.iml

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

<module type="JAVA_MODULE" version="4">

  <component name="NewModuleRootManager" inherit-compiler-output="true">

    <exclude-output />

    <content url="file://$MODULE_DIR$" />

    <orderEntry type="inheritedJdk" />

    <orderEntry type="sourceFolder" forTests="false" />

  </component>

</module>
 
 No newline at end of file

.idea/ant.xml

0 → 100644
+7 −0
Changes for .idea/ant.xml: 7 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$/jeuAssemblage/build.xml" />

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

  </component>

</project>
 
 No newline at end of file

.idea/libraries/jeuAssemblage_0_1.xml

0 → 100644
+9 −0
Changes for .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$/jeuAssemblage/dist/jeuAssemblage-0.1.jar!/" />

    </CLASSES>

    <JAVADOC />

    <SOURCES />

  </library>

</component>
 
 No newline at end of file