diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-12-13 16:08:19 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-12-13 16:08:19 +0100 |
| commit | 51f788fd4e81186be2f7b7b4459d3d90a7b47bf2 (patch) | |
| tree | 232659156f76ff7664139d963dac8d8c68e1d43f /docs/en/static | |
| parent | 70811d699e68c075ed3cae543cbb8b695d386730 (diff) | |
| parent | 3aaae876d73a9c16d2961bea9ae2012ae0bc5b0e (diff) | |
| download | Chimère-51f788fd4e81186be2f7b7b4459d3d90a7b47bf2.tar.bz2 Chimère-51f788fd4e81186be2f7b7b4459d3d90a7b47bf2.zip | |
Merge branch 'master' into saclay
Conflicts:
chimere/admin.py
chimere/locale/fr/LC_MESSAGES/django.po
chimere/tests.py
chimere/utils.py
Diffstat (limited to 'docs/en/static')
| -rw-r--r-- | docs/en/static/chimere_admin_00.png | bin | 0 -> 5855 bytes |
| -rw-r--r-- | docs/en/static/chimere_admin_01.png | bin | 0 -> 69448 bytes |
| -rw-r--r-- | docs/en/static/chimere_admin_02.png | bin | 0 -> 62730 bytes |
| -rw-r--r-- | docs/en/static/chimere_admin_03.png | bin | 0 -> 65588 bytes |
| -rw-r--r-- | docs/en/static/chimere_admin_import_CSV.png | bin | 0 -> 16957 bytes |
| -rw-r--r-- | docs/en/static/chimere_admin_import_KML.png | bin | 0 -> 19520 bytes |
| -rw-r--r-- | docs/en/static/chimere_admin_import_OSM.png | bin | 0 -> 127457 bytes |
| -rw-r--r-- | docs/en/static/chimere_admin_import_georss.png | bin | 0 -> 14414 bytes |
| -rw-r--r-- | docs/en/static/chimere_admin_import_shapefile.png | bin | 0 -> 18301 bytes |
| -rw-r--r-- | docs/en/static/chimere_admin_modified_management.png | bin | 0 -> 93852 bytes |
| -rw-r--r-- | docs/en/static/chimere_admin_modify_item.png | bin | 0 -> 109282 bytes |
11 files changed, 0 insertions, 0 deletions
diff --git a/docs/en/static/chimere_admin_00.png b/docs/en/static/chimere_admin_00.png Binary files differnew file mode 100644 index 0000000..374c6b6 --- /dev/null +++ b/docs/en/static/chimere_admin_00.png diff --git a/docs/en/static/chimere_admin_01.png b/docs/en/static/chimere_admin_01.png Binary files differnew file mode 100644 index 0000000..0db7f4d --- /dev/null +++ b/docs/en/static/chimere_admin_01.png diff --git a/docs/en/static/chimere_admin_02.png b/docs/en/static/chimere_admin_02.png Binary files differnew file mode 100644 index 0000000..d0fd6fe --- /dev/null +++ b/docs/en/static/chimere_admin_02.png diff --git a/docs/en/static/chimere_admin_03.png b/docs/en/static/chimere_admin_03.png Binary files differnew file mode 100644 index 0000000..e815500 --- /dev/null +++ b/docs/en/static/chimere_admin_03.png diff --git a/docs/en/static/chimere_admin_import_CSV.png b/docs/en/static/chimere_admin_import_CSV.png Binary files differnew file mode 100644 index 0000000..20e53c9 --- /dev/null +++ b/docs/en/static/chimere_admin_import_CSV.png diff --git a/docs/en/static/chimere_admin_import_KML.png b/docs/en/static/chimere_admin_import_KML.png Binary files differnew file mode 100644 index 0000000..ad35302 --- /dev/null +++ b/docs/en/static/chimere_admin_import_KML.png diff --git a/docs/en/static/chimere_admin_import_OSM.png b/docs/en/static/chimere_admin_import_OSM.png Binary files differnew file mode 100644 index 0000000..03b3632 --- /dev/null +++ b/docs/en/static/chimere_admin_import_OSM.png diff --git a/docs/en/static/chimere_admin_import_georss.png b/docs/en/static/chimere_admin_import_georss.png Binary files differnew file mode 100644 index 0000000..6c95693 --- /dev/null +++ b/docs/en/static/chimere_admin_import_georss.png diff --git a/docs/en/static/chimere_admin_import_shapefile.png b/docs/en/static/chimere_admin_import_shapefile.png Binary files differnew file mode 100644 index 0000000..0f5bdcf --- /dev/null +++ b/docs/en/static/chimere_admin_import_shapefile.png diff --git a/docs/en/static/chimere_admin_modified_management.png b/docs/en/static/chimere_admin_modified_management.png Binary files differnew file mode 100644 index 0000000..84e069e --- /dev/null +++ b/docs/en/static/chimere_admin_modified_management.png diff --git a/docs/en/static/chimere_admin_modify_item.png b/docs/en/static/chimere_admin_modify_item.png Binary files differnew file mode 100644 index 0000000..861ea20 --- /dev/null +++ b/docs/en/static/chimere_admin_modify_item.png |
