diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-05-06 18:11:01 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-05-06 18:11:01 -0600 |
| commit | 15ae97fbdb4e75a74ea2e716194661d19dec46ff (patch) | |
| tree | c141b70e4f6799e1fce5ade4ad632f99eb0247ff | |
| parent | ac7be4a40df88ee3a0992e041635e4ac4cf5ac48 (diff) | |
| parent | 1216c0ccece4ca1492967a341c5d01e9e5068ed8 (diff) | |
Merge branch 'master' into branch-1.6
| -rw-r--r-- | icon/.gitignore | 2 | ||||
| -rw-r--r-- | src/telebt-v3.0/.gitignore | 2 | ||||
| -rw-r--r-- | src/telerepeat-v1.0/.gitignore | 2 | ||||
| -rw-r--r-- | src/telerepeat-v1.0/.sdcdbrc | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/icon/.gitignore b/icon/.gitignore index 94c7c70c..3122511d 100644 --- 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 index 00000000..a7d61147 --- /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 index 00000000..4bb125bc --- /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 index 00000000..2c77e32b --- /dev/null +++ b/src/telerepeat-v1.0/.sdcdbrc @@ -0,0 +1,2 @@ +--directory=../cc1111:../product:../kernel:../drivers:. + |