Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
pyromaths
pyromaths
Commits
a69c4873
Commit
a69c4873
authored
Jun 19, 2018
by
Jérôme Ortais
Browse files
Merge branch 'jinja2' into develop
parents
09ab5874
527f1bcb
Changes
1
Hide whitespace changes
Inline
Side-by-side
utils/make_packages.sh
View file @
a69c4873
...
...
@@ -65,19 +65,11 @@ esac
echo
"*** Update pyromaths web-site links..."
cat
>
${
PYROPATH
}
/pyrosite.txt
<<
EOF
<<<<<<< HEAD
* !/static/img/debian.png(Linux)! "Pyromaths pour Linux - deb":/telecharger/pyromaths_
${
VERSION
}
_all.deb
* !/static/img/redhat.png(Linux)! "Pyromaths pour Linux - rpm":/telecharger/pyromaths-
${
VERSION
}
-1.noarch.rpm
* !/static/img/macosx.png(Mac OS X)! "Pyromaths pour Mac OS X":/telecharger/pyromaths-
${
VERSION
}
-macos.dmg
* !/static/img/winvista.png(Windows)! "Pyromaths pour Windows":/telecharger/pyromaths-
${
VERSION
}
-win32.exe
* !/static/img/source.png(Sources)! "Sources de Pyromaths":/telecharger/pyromaths-
${
VERSION
}
-sources.tar.bz2
=======
* !/media/img/debian.png(Linux)! "Pyromaths pour Linux - deb":/telecharger/pyromaths_
${
VERSION
}
-1_all.deb
* !/media/img/redhat.png(Linux)! "Pyromaths pour Linux - rpm":/telecharger/pyromaths-
${
VERSION
}
-1.noarch.rpm
* !/media/img/macosx.png(Mac OS X)! "Pyromaths pour Mac OS X":/telecharger/pyromaths-
${
VERSION
}
-macos.dmg
* !/media/img/winvista.png(Windows)! "Pyromaths pour Windows":/telecharger/pyromaths-
${
VERSION
}
-win32.exe
* !/media/img/source.png(Sources)! "Sources de Pyromaths":/telecharger/pyromaths-
${
VERSION
}
-sources.tar.bz2
>>>>>>> develop
<hr/>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment