summaryrefslogtreecommitdiff
path: root/example_project/media
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2013-02-19 11:09:26 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2013-02-19 11:09:26 +0100
commitd2f705ef0d03a7ace25c78152bf5d7a3d85fa914 (patch)
treed780d992b0937ba1b010332c8e623c54cdfbbae1 /example_project/media
parentdce6d0499efe505096495b36728eeb8c9fb8ced1 (diff)
parent4a5f51d26982fe04eae01ee6ca0bbdb8b3153173 (diff)
downloadChimère-d2f705ef0d03a7ace25c78152bf5d7a3d85fa914.tar.bz2
Chimère-d2f705ef0d03a7ace25c78152bf5d7a3d85fa914.zip
Merge branch 'master' of ssh://etienne@daenerys.peacefrogs.net/var/local/git/chimere
Diffstat (limited to 'example_project/media')
-rwxr-xr-xexample_project/media/icons/marker.pngbin606 -> 0 bytes
-rw-r--r--example_project/media/icons/readme1
-rw-r--r--example_project/media/pictures/readme1
-rw-r--r--example_project/media/route_files/readme1
4 files changed, 0 insertions, 3 deletions
diff --git a/example_project/media/icons/marker.png b/example_project/media/icons/marker.png
deleted file mode 100755
index ccd1913..0000000
--- a/example_project/media/icons/marker.png
+++ /dev/null
Binary files differ
diff --git a/example_project/media/icons/readme b/example_project/media/icons/readme
deleted file mode 100644
index 560759a..0000000
--- a/example_project/media/icons/readme
+++ /dev/null
@@ -1 +0,0 @@
-Icons are stored here
diff --git a/example_project/media/pictures/readme b/example_project/media/pictures/readme
deleted file mode 100644
index c0d20b7..0000000
--- a/example_project/media/pictures/readme
+++ /dev/null
@@ -1 +0,0 @@
-Pictures are stored here
diff --git a/example_project/media/route_files/readme b/example_project/media/route_files/readme
deleted file mode 100644
index 90d72ab..0000000
--- a/example_project/media/route_files/readme
+++ /dev/null
@@ -1 +0,0 @@
-Route files are stored here