]> rtime.felk.cvut.cz Git - pes-rpp/rpp-test-sw.git/commitdiff
Update library to RM48 branch
authorMichal Horn <hornmich@fel.cvut.cz>
Fri, 7 Nov 2014 15:17:51 +0000 (16:17 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Wed, 3 Dec 2014 17:51:36 +0000 (18:51 +0100)
.gitmodules
rpp-lib

index 6d78c461cedbd03781deb926c3573f209c06053c..928c68fc77f4df8ea4b91c729d65fb75cbc6ea71 100644 (file)
@@ -2,5 +2,5 @@
        path = rpp-lib
        url = git@rtime.felk.cvut.cz:pes-rpp/rpp-lib
        update = merge
-       branch = master
+       branch = rm48/master
        fetchRecurseSubmodules = true
diff --git a/rpp-lib b/rpp-lib
index b446fb76462cbf0d15f7a26d078613635d9d8ffd..d2b10e2da4d65db6ba010876b38af3c9cefce630 160000 (submodule)
--- a/rpp-lib
+++ b/rpp-lib
@@ -1 +1 @@
-Subproject commit b446fb76462cbf0d15f7a26d078613635d9d8ffd
+Subproject commit d2b10e2da4d65db6ba010876b38af3c9cefce630