diff options
| author | Didier Raboud <odyx@debian.org> | 2012-12-20 07:58:57 +0100 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2012-12-20 07:58:57 +0100 |
| commit | 2d50ff1c39aa7f26d0dccc0b9132af9573218921 (patch) | |
| tree | 3655d129af8a8ea474602f41b74023258f997ba9 /.gitmodules | |
| parent | 273a97fbc2cb81bfcd468e2bdb6b0600b0d739cf (diff) | |
| parent | f77734e01c85aded92cf5fdc1e7038658e6aaf29 (diff) | |
| download | colobot-2d50ff1c39aa7f26d0dccc0b9132af9573218921.tar.gz colobot-2d50ff1c39aa7f26d0dccc0b9132af9573218921.tar.bz2 colobot-2d50ff1c39aa7f26d0dccc0b9132af9573218921.zip | |
Merge branch 'dev' into debian
Conflicts:
.travis.yml
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 3 |
1 files changed, 3 insertions, 0 deletions
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 |