summaryrefslogtreecommitdiff
path: root/src/test/.gitignore
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2013-12-19 01:38:40 -0700
committerBdale Garbee <bdale@gag.com>2013-12-19 01:38:40 -0700
commit575bbaf976c5840fd0e308549c45a466fdec1352 (patch)
tree11bfb498348bf7687bffc24699c4b1a998988ee4 /src/test/.gitignore
parentb825116df173b77e2cab217a7b76112c742f9279 (diff)
parentbc3610d8cecbfed40c62d4dcb93fc9a4d2a7c9e3 (diff)
Merge branch 'branch-1.3' into debian
Conflicts: ChangeLog altoslib/AltosRecordMM.java altosui/Makefile.am altosui/altos-windows.nsi.in configure.ac debian/changelog debian/control doc/Makefile doc/altusmetrum.xsl doc/release-notes-1.2.1.xsl doc/release-notes-1.2.xsl
Diffstat (limited to 'src/test/.gitignore')
-rw-r--r--src/test/.gitignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/test/.gitignore b/src/test/.gitignore
index 90af6517..b8b2513e 100644
--- a/src/test/.gitignore
+++ b/src/test/.gitignore
@@ -5,6 +5,10 @@ ao_flight_test_baro
ao_flight_test_accel
ao_gps_test
ao_gps_test_skytraq
+ao_gps_test_ublox
+ao_int64_test
+ao_ms5607_convert_test
+ao_quaternion_test
ao_convert_test
ao_convert_pa_test
ao_fat_test