diff --git a/.gitignore b/.gitignore index b4dfddcac..606e522a3 100644 --- a/.gitignore +++ b/.gitignore @@ -21,7 +21,7 @@ Thumbs.db !supportlibs/libsam3/Makefile # QtCreator cruft -*CMakeLists.txt.user +*CMakeLists.txt.user* # Build artifacts /jsonapi-generator/src/jsonapi-generator diff --git a/build_scripts/OBS b/build_scripts/OBS index 353596b0e..ce70038d0 160000 --- a/build_scripts/OBS +++ b/build_scripts/OBS @@ -1 +1 @@ -Subproject commit 353596b0ee5ea76611eb663b90bf3ab1c9f34ad7 +Subproject commit ce70038d0ff0110360b1529a8743307c8354e8aa diff --git a/libretroshare b/libretroshare index bfa91bdef..63a6a067d 160000 --- a/libretroshare +++ b/libretroshare @@ -1 +1 @@ -Subproject commit bfa91bdef24f2339f1db053d155a6ef169027a95 +Subproject commit 63a6a067d7198acab21912903b048ca30855c8d9