Merge branch 'master' into branch-1.6

diff --git a/icon/.gitignore b/icon/.gitignore
index 94c7c70cffbeff4ec6ab32b2efacf621d9b9f6ba..3122511d01ff7b10c64eaac853fe475de346e9a9 100644 (file)
--- a/icon/.gitignore
+++ b/icon/.gitignore
@@ -1,5 +1,7 @@
 application-*.png
 altusmetrum-*.png
+altusmetrum.xpm
+application-vnd.altusmetrum.micropeak.svg
 *.rc
 *.ico
 *.icns

diff --git a/src/telebt-v3.0/.gitignore b/src/telebt-v3.0/.gitignore
new file mode 100644 (file)
index 0000000..a7d6114
--- /dev/null
+++ b/src/telebt-v3.0/.gitignore
@@ -0,0 +1,2 @@
+ao_product.h
+telebt-*.elf

diff --git a/src/telerepeat-v1.0/.gitignore b/src/telerepeat-v1.0/.gitignore
new file mode 100644 (file)
index 0000000..4bb125b
--- /dev/null
+++ b/src/telerepeat-v1.0/.gitignore
@@ -0,0 +1,2 @@
+telerepeat-*
+ao_product.h

diff --git a/src/telerepeat-v1.0/.sdcdbrc b/src/telerepeat-v1.0/.sdcdbrc
new file mode 100644 (file)
index 0000000..2c77e32
--- /dev/null
+++ b/src/telerepeat-v1.0/.sdcdbrc
@@ -0,0 +1,2 @@
+--directory=../cc1111:../product:../kernel:../drivers:.
+