Commit 6c34299c authored by Andreas Schmidt's avatar Andreas Schmidt
Browse files

Merge branch 'master' into develop

parents ecd683bb f463a130

.gitmodules

+1 −1
Original line number Diff line number Diff line 
[submodule "prrt/xlap"]

	path = prrt/xlap

	url = ../../as/X-Lap.git
 
	url = ../X-Lap.git

xlap @ 956abea5

Original line number Diff line number Diff line 
Subproject commit b87b0b7953c279c4acde42f2b3535c309048d8ab
 
Subproject commit 956abea52c2a88e6d5124a5bf04289a1c2563ca4