Merge remote-tracking branch 'origin/develop' into merging-2019-w51-to-develop-nr

2020-01-10 15:35:54 +01:00
parent 6c3d5cf02d c256932fe5
commit e7aa071e1b
184 changed files with 34802 additions and 1434 deletions
@@ -5,6 +5,10 @@
 cmake_targets/log/
 cmake_targets/*/build/
 cmake_targets/ran_build/
+cmake_targets/nas_sim_tools/build/
 log/
 lte_build_oai/
 targets/bin/
+
+# vscode
+.vscode