summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-12-19 21:25:40 +0100
committerPiotr Dziwinski <piotrdz@gmail.com>2012-12-19 21:25:40 +0100
commit3559100db9ca1e1e29116cb71df9420abea694e9 (patch)
tree7540388d7cd248ca7f99321e0cf1181905d96bab
parent842f4a15d81c385b0e5ac09dad8d2b2e6b3819e9 (diff)
downloadcolobot-3559100db9ca1e1e29116cb71df9420abea694e9.tar.gz
colobot-3559100db9ca1e1e29116cb71df9420abea694e9.tar.bz2
colobot-3559100db9ca1e1e29116cb71df9420abea694e9.zip
Added colobot-data as git submodule
-rw-r--r--.gitignore3
-rw-r--r--.gitmodules3
m---------data0
3 files changed, 3 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 4f78a85..bc2649c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,6 @@
# Ignore the documentation folder
/doc
-# We don't want anyone to checkin /data folder
-/data
-
# Ignore local data
/colobot.ini
/savegame
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..2e2b0cc
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "data"]
+ path = data
+ url = git://github.com/colobot/colobot-data.git
diff --git a/data b/data
new file mode 160000
+Subproject a1049a693f20ae5317ff5ff061104add21ba260