Commit 55d96a37 authored by Theophile Terraz's avatar Theophile Terraz
Browse files

Merge branch 'test_merge_master' into terraz_dev

No related merge requests found
Pipeline #58979 failed with stages
in 43 seconds
Showing with 55 additions and 0 deletions
+55 -0
......@@ -9,6 +9,8 @@
*.class
tmp
mage8
adists
*.tar
*.tar.*
......
# Default ignored files
/shelf/
/workspace.xml
<component name="InspectionProjectProfileManager">
<settings>
<option name="USE_PROJECT_PROFILE" value="false" />
<version value="1.0" />
</settings>
</component>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Black">
<option name="sdkName" value="Python 3.10 (pamhyr)" />
</component>
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (pamhyr)" project-jdk-type="Python SDK" />
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/pamhyr.iml" filepath="$PROJECT_DIR$/.idea/pamhyr.iml" />
</modules>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/venv" />
</content>
<orderEntry type="jdk" jdkName="Python 3.10 (pamhyr)" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="PyDocumentationSettings">
<option name="format" value="PLAIN" />
<option name="myDocStringFormat" value="Plain" />
</component>
</module>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>
\ No newline at end of file
adists/adists 0 → 100755
File added
......@@ -431,3 +431,12 @@
36270.0000 21.3000 17.0100 rd
36270.0000 23.0000 19.5000
999.9990 999.9990 999.9990
39 0 0 7 36271.0000 S1bis
36271.0000 0.0000 20.0000
36271.0000 1.8000 17.0100 rg
36271.0000 3.0000 13.0800
36271.0000 11.5000 13.0500
36271.0000 20.0000 13.0800
36271.0000 21.3000 17.0100 rd
36271.0000 23.0000 19.5000
999.9990 999.9990 999.9990
doc/users/Tuto1/img/Geo.png

101 KB | W: | H:

doc/users/Tuto1/img/Geo.png

108 KB | W: | H:

doc/users/Tuto1/img/Geo.png
doc/users/Tuto1/img/Geo.png
doc/users/Tuto1/img/Geo.png
doc/users/Tuto1/img/Geo.png
  • 2-up
  • Swipe
  • Onion skin
doc/users/Tuto1/img/Geo2.png

168 KB | W: | H:

doc/users/Tuto1/img/Geo2.png

163 KB | W: | H:

doc/users/Tuto1/img/Geo2.png
doc/users/Tuto1/img/Geo2.png
doc/users/Tuto1/img/Geo2.png
doc/users/Tuto1/img/Geo2.png
  • 2-up
  • Swipe
  • Onion skin
doc/users/Tuto1/img/Seuil.png

38.3 KB

doc/users/Tuto1/img/dl.png

15.7 KB | W: | H:

doc/users/Tuto1/img/dl.png

16.3 KB | W: | H:

doc/users/Tuto1/img/dl.png
doc/users/Tuto1/img/dl.png
doc/users/Tuto1/img/dl.png
doc/users/Tuto1/img/dl.png
  • 2-up
  • Swipe
  • Onion skin
doc/users/Tuto1/img/fev2002.png

62.5 KB | W: | H:

doc/users/Tuto1/img/fev2002.png

61 KB | W: | H:

doc/users/Tuto1/img/fev2002.png
doc/users/Tuto1/img/fev2002.png
doc/users/Tuto1/img/fev2002.png
doc/users/Tuto1/img/fev2002.png
  • 2-up
  • Swipe
  • Onion skin
doc/users/Tuto1/img/frictions.png

47.9 KB | W: | H:

doc/users/Tuto1/img/frictions.png

49.5 KB | W: | H:

doc/users/Tuto1/img/frictions.png
doc/users/Tuto1/img/frictions.png
doc/users/Tuto1/img/frictions.png
doc/users/Tuto1/img/frictions.png
  • 2-up
  • Swipe
  • Onion skin
doc/users/Tuto1/img/frictions2.png

47 KB

doc/users/Tuto1/img/hs.png

46 KB | W: | H:

doc/users/Tuto1/img/hs.png

57 KB | W: | H:

doc/users/Tuto1/img/hs.png
doc/users/Tuto1/img/hs.png
doc/users/Tuto1/img/hs.png
doc/users/Tuto1/img/hs.png
  • 2-up
  • Swipe
  • Onion skin
doc/users/Tuto1/img/ic.png

93.7 KB | W: | H:

doc/users/Tuto1/img/ic.png

97.2 KB | W: | H:

doc/users/Tuto1/img/ic.png
doc/users/Tuto1/img/ic.png
doc/users/Tuto1/img/ic.png
doc/users/Tuto1/img/ic.png
  • 2-up
  • Swipe
  • Onion skin
doc/users/Tuto1/img/maillage.png

26 KB | W: | H:

doc/users/Tuto1/img/maillage.png

25.8 KB | W: | H:

doc/users/Tuto1/img/maillage.png
doc/users/Tuto1/img/maillage.png
doc/users/Tuto1/img/maillage.png
doc/users/Tuto1/img/maillage.png
  • 2-up
  • Swipe
  • Onion skin
doc/users/Tuto1/img/mjpk.png

20.9 KB

Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment