Merge branch 'pasdk1_3_master' into prsdk_pa_demo_sync_external_git

diff --git a/.gitattributes b/.gitattributes
index 1e53d13171daa1e9c071aa1419bba13828c0ac8c..f9ddb8846e050cd48f3533c4adb8879076895893 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
 # Denote all files as binary and should not be modified (do not convert LF to CR/LF).
 psdk_cust/ipc_3_43_00_00_eng/* text eol=lf
+.gitmodules merge=ours

diff --git a/.gitmodules b/.gitmodules
index b90d9b0e1b2f5e86c5629f2895b654275902ff60..dd9bbf958140441c8a6a5df272eebce0a3979eb3 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,39 +1,6 @@
-[submodule "dolby_ip/bmda"]
-       path = dolby_ip/bmda
-       url = ssh://git@bitbucket.itg.ti.com/pasdk-dolbyip/bmda.git
-[submodule "dolby_ip/car"]
-       path = dolby_ip/car
-       url = ssh://git@bitbucket.itg.ti.com/pasdk-dolbyip/car.git
-[submodule "dolby_ip/dap"]
-       path = dolby_ip/dap
-       url = ssh://git@bitbucket.itg.ti.com/pasdk-dolbyip/dap.git
-[submodule "dolby_ip/ddp"]
-       path = dolby_ip/ddp
-       url = ssh://git@bitbucket.itg.ti.com/pasdk-dolbyip/ddp.git
-[submodule "dolby_ip/intrinsics"]
-       path = dolby_ip/intrinsics
-       url = ssh://git@bitbucket.itg.ti.com/pasdk-dolbyip/intrinsics.git
-[submodule "dolby_ip/mat-thd"]
-       path = dolby_ip/mat-thd
-       url = ssh://git@bitbucket.itg.ti.com/pasdk-dolbyip/mat-thd.git
-[submodule "dolby_ip/oar"]
-       path = dolby_ip/oar
-       url = ssh://git@bitbucket.itg.ti.com/pasdk-dolbyip/oar.git
 [submodule "pasdk/paf"]
        path = pasrc/paf
        url = ssh://git@bitbucket.itg.ti.com/pasdk/paf.git
 [submodule "tools"]
        path = tools
        url = ssh://git@bitbucket.itg.ti.com/pasdk/tools.git
-[submodule "3p-ip-dts"]
-       path = 3p-ip-dts
-       url = ssh://git@bitbucket.itg.ti.com/pasdk/3p-ip-dts.git
-[submodule "3p-ip-fraunhofer"]
-       path = 3p-ip-fraunhofer
-       url = ssh://git@bitbucket.itg.ti.com/pasdk/3p-ip-fraunhofer.git
-[submodule "pasdk/asp"]
-       path = asp
-       url = ssh://git@bitbucket.itg.ti.com/pasdk/asp.git
-[submodule "pasdk/3p-ip-ti"]
-       path = 3p-ip-ti
-       url = ssh://git@bitbucket.itg.ti.com/pasdk/3p-ip-ti.git

diff --git a/3p-ip-dts b/3p-ip-dts
deleted file mode 160000 (submodule)
index 04eee1d..0000000
--- a/3p-ip-dts
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 04eee1d713a31cedea61693839a3a3aa436467b9

diff --git a/3p-ip-fraunhofer b/3p-ip-fraunhofer
deleted file mode 160000 (submodule)
index 00f6554..0000000
--- a/3p-ip-fraunhofer
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 00f6554a1263b075079c4072b323780f68ebe015

diff --git a/3p-ip-ti b/3p-ip-ti
deleted file mode 160000 (submodule)
index 994bafc..0000000
--- a/3p-ip-ti
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 994bafc129acecf23b9463bdda46fe9cb66380df

diff --git a/asp b/asp
deleted file mode 160000 (submodule)
index 5e5453c..0000000
--- a/asp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5e5453c7de71ab650d4bd081d1b4ea33a090aed0

diff --git a/dolby_ip/bmda b/dolby_ip/bmda
deleted file mode 160000 (submodule)
index 007eed3..0000000
--- a/dolby_ip/bmda
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 007eed30835325dbc7ee0b12243295f128399812

diff --git a/dolby_ip/car b/dolby_ip/car
deleted file mode 160000 (submodule)
index 4d7c8d4..0000000
--- a/dolby_ip/car
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4d7c8d449fb2fe7c8ac79454e74c0ba8e1b32e09

diff --git a/dolby_ip/dap b/dolby_ip/dap
deleted file mode 160000 (submodule)
index e57a67b..0000000
--- a/dolby_ip/dap
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e57a67bbdece565c4bf32786d7b59253cdaaa0c6

diff --git a/dolby_ip/ddp b/dolby_ip/ddp
deleted file mode 160000 (submodule)
index 9d73fb7..0000000
--- a/dolby_ip/ddp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9d73fb781880d17a4da233d85159d3fcea68ad61

diff --git a/dolby_ip/intrinsics b/dolby_ip/intrinsics
deleted file mode 160000 (submodule)
index 81498fb..0000000
--- a/dolby_ip/intrinsics
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 81498fb2c234aa3a93e41e35bdba3d6439da66e6

diff --git a/dolby_ip/mat-thd b/dolby_ip/mat-thd
deleted file mode 160000 (submodule)
index cec437a..0000000
--- a/dolby_ip/mat-thd
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cec437ade8959a5a90cbdfb877d6f800e94b96a0

diff --git a/dolby_ip/oar b/dolby_ip/oar
deleted file mode 160000 (submodule)
index f2853b1..0000000
--- a/dolby_ip/oar
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f2853b1b0462cf7f9fc127c89f0b1d26db4aca35