Merge branch 'develop' into develop-nr

2019-05-17 17:11:31 +02:00
parent 7e99e1f6b1 81d4202b9b
commit 7719314983
867 changed files with 123167 additions and 84023 deletions
@@ -1,4 +1,9 @@
+# vim swp
+*.swp
+
+# log and exec file
 cmake_targets/log/
 cmake_targets/*/build/
-targets/bin/
-
+log/
+lte_build_oai/
+targets/bin/