summaryrefslogtreecommitdiff
path: root/data/tmp
diff options
context:
space:
mode:
authorKlap-in <klapinklapin@gmail.com>2013-07-14 13:35:06 +0200
committerKlap-in <klapinklapin@gmail.com>2013-07-14 13:35:06 +0200
commit33c3b3817b00aa9384760813643fac0e33daaaff (patch)
tree481c880b00a32ba5887834b52a17248bac8bfc7c /data/tmp
parent040f0e135c37c5b544f16277ff69205369df5f1f (diff)
parentfbd8067eeeb9f424981aad8b283e17f734c738c3 (diff)
downloadrpg-33c3b3817b00aa9384760813643fac0e33daaaff.tar.gz
rpg-33c3b3817b00aa9384760813643fac0e33daaaff.tar.bz2
merge master in branch
Diffstat (limited to 'data/tmp')
-rw-r--r--data/tmp/_dummy1
1 files changed, 1 insertions, 0 deletions
diff --git a/data/tmp/_dummy b/data/tmp/_dummy
index e69de29bb..e492265be 100644
--- a/data/tmp/_dummy
+++ b/data/tmp/_dummy
@@ -0,0 +1 @@
+You can safely delete this file. \ No newline at end of file