diff --git a/.gitmodules b/.gitmodules index f4a19857..0b5b4004 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,9 @@ [submodule "data"] path = data url = git://github.com/colobot/colobot-data.git + branch = . + update = rebase [submodule "lib/googletest"] path = lib/googletest url = git://github.com/google/googletest.git + ignore = all diff --git a/data b/data index 21a45c0b..5d658744 160000 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit 21a45c0b8809accd142a83a81f1a3c92a327f319 +Subproject commit 5d658744641064e56cf489453dbf726964b2b98d diff --git a/lib/googletest b/lib/googletest index 703bd9ca..e2239ee6 160000 --- a/lib/googletest +++ b/lib/googletest @@ -1 +1 @@ -Subproject commit 703bd9caab50b139428cea1aaff9974ebee5742e +Subproject commit e2239ee6043f73722e7aa812a459f54a28552929