Commit a9046e57 authored by Guillaume Sagnol's avatar Guillaume Sagnol

removed conflict data

parent b1abff28
lancer python ../../add_warning_notlast.py from directory /doc/full_html/x.x.x (former_version)
lancer script add_google_script directly from /doc
Changer CHANGE file
Creer dist file (python setup.py sdist) -> check that the doc is in the dist file ???
make html (to copy dist)
rsync to /www:
rsync -luzvr full_html/* opts1.zib.de:/www/Abt-Optimization/picos
Register on pypi (python setup.py register, username guillaume.sagnol)
sed -i 's/Picos 0\.1\.0/Picos 0\.1\.1/g' picos/*.py
et change version num dans conf.py and setup.py and __init__.py
make new directory in the full_html directory and update the symolic link "last" with the ".." trick
#git clone https://github.com/gsagnol/picos.git (to clone)
merge master into master_github:
commit and push on master_github:
git push github master_github
This diff is collapsed.
Markdown is supported
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