Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum

diff --git a/MicroPeak/index.mdwn b/MicroPeak/index.mdwn
index 5938b00f9f3e1912b97203df43d9f0d5fae6a4c7..d74e2930672edf92d6ae8039c623289554390deb 100644 (file)
--- a/MicroPeak/index.mdwn
+++ b/MicroPeak/index.mdwn
@@ -32,11 +32,11 @@ running Mac OS X or Windows, a compatible version of those drivers is
 included with the software. You can also install a different from from
 the [FTDI Driver](http://www.ftdichip.com/FTDrivers.htm) page.
 
-### Latest version ###
+### Latest version (1.2) ###
 
- * [Windows](releases/1.2/MicroPeak-Windows-1-1-9-3.exe)
- * [Linux](releases/1.2/MicroPeak-Linux-1.1.9.3.tar.bz2)
- * [Mac OS X](releases/1.2/MicroPeak-Mac-1.1.9.3.dmg)
+ * [Windows](releases/1.2/MicroPeak-Windows-1-2.exe)
+ * [Linux](releases/1.2/MicroPeak-Linux-1.2.tar.bz2)
+ * [Mac OS X](releases/1.2/MicroPeak-Mac-1.2.dmg)
 
 ## Hardware Features ##
 

diff --git a/MicroPeak/releases/1.2/MicroPeak-Linux-1.1.9.3.tar.bz2 b/MicroPeak/releases/1.2/MicroPeak-Linux-1.1.9.3.tar.bz2
deleted file mode 100644 (file)
index ff6c0f4..0000000
Binary files a/MicroPeak/releases/1.2/MicroPeak-Linux-1.1.9.3.tar.bz2 and /dev/null differ

diff --git a/MicroPeak/releases/1.2/MicroPeak-Linux-1.2.tar.bz2 b/MicroPeak/releases/1.2/MicroPeak-Linux-1.2.tar.bz2
new file mode 100644 (file)
index 0000000..7c709fa
Binary files /dev/null and b/MicroPeak/releases/1.2/MicroPeak-Linux-1.2.tar.bz2 differ

diff --git a/MicroPeak/releases/1.2/MicroPeak-Mac-1.1.9.3.dmg b/MicroPeak/releases/1.2/MicroPeak-Mac-1.1.9.3.dmg
deleted file mode 100644 (file)
index 5f206dc..0000000
Binary files a/MicroPeak/releases/1.2/MicroPeak-Mac-1.1.9.3.dmg and /dev/null differ

diff --git a/MicroPeak/releases/1.2/MicroPeak-Mac-1.2.dmg b/MicroPeak/releases/1.2/MicroPeak-Mac-1.2.dmg
new file mode 100644 (file)
index 0000000..30aa445
Binary files /dev/null and b/MicroPeak/releases/1.2/MicroPeak-Mac-1.2.dmg differ

diff --git a/MicroPeak/releases/1.2/MicroPeak-Windows-1-1-9-3.exe b/MicroPeak/releases/1.2/MicroPeak-Windows-1-1-9-3.exe
deleted file mode 100644 (file)
index aa1c974..0000000
Binary files a/MicroPeak/releases/1.2/MicroPeak-Windows-1-1-9-3.exe and /dev/null differ

diff --git a/MicroPeak/releases/1.2/MicroPeak-Windows-1-2.exe b/MicroPeak/releases/1.2/MicroPeak-Windows-1-2.exe
new file mode 100644 (file)
index 0000000..0bdcb9d
Binary files /dev/null and b/MicroPeak/releases/1.2/MicroPeak-Windows-1-2.exe differ

diff --git a/MicroPeakUSB/index.mdwn b/MicroPeakUSB/index.mdwn
index 0165144e8e41912ebe9f6181681d53ffaffccfa0..959e4d770b77b7ac499bdb35d31085981615027b 100644 (file)
--- a/MicroPeakUSB/index.mdwn
+++ b/MicroPeakUSB/index.mdwn
@@ -7,7 +7,7 @@ The MicroPeak USB Interface board provides a way to capture
 [MicroPeak](../MicroPeak/) flight logs over a USB connection to a
 computer running Linux, Mac OS or Windows.
 
-<a href="v1.0/MicroPeakUSB.jpg"><img src="v1.0/MicroPeakUSB-640.jpg"></a>
+<a href="v1.0/mpusb-dime.jpg"><img src="v1.0/mpusb-dime-640.jpg"></a>
 
 ## MicroPeak Data ##
 
@@ -30,6 +30,8 @@ op-amp and serial-to-USB interface chip. It also includes a blue LED
 which blinks in time with the [MicroPeak](../MicroPeak/) orange LED. This makes
 aligning the two boards by hand quite easy.
 
+<a href="v1.0/mpbundle.jpg"><img src="v1.0/mpbundle-640.jpg"></a>
+
 ## MicroPeak Application ##
 
 The MicroPeak application written in Java runs on

diff --git a/MicroPeakUSB/v1.0/mpbundle-640.jpg b/MicroPeakUSB/v1.0/mpbundle-640.jpg
new file mode 100644 (file)
index 0000000..5d5cf3d
Binary files /dev/null and b/MicroPeakUSB/v1.0/mpbundle-640.jpg differ

diff --git a/MicroPeakUSB/v1.0/mpbundle.jpg b/MicroPeakUSB/v1.0/mpbundle.jpg
new file mode 100644 (file)
index 0000000..167a17c
Binary files /dev/null and b/MicroPeakUSB/v1.0/mpbundle.jpg differ

diff --git a/MicroPeakUSB/v1.0/mpusb-dime-640.jpg b/MicroPeakUSB/v1.0/mpusb-dime-640.jpg
new file mode 100644 (file)
index 0000000..c425f56
Binary files /dev/null and b/MicroPeakUSB/v1.0/mpusb-dime-640.jpg differ

diff --git a/MicroPeakUSB/v1.0/mpusb-dime.jpg b/MicroPeakUSB/v1.0/mpusb-dime.jpg
new file mode 100644 (file)
index 0000000..7cfa4fc
Binary files /dev/null and b/MicroPeakUSB/v1.0/mpusb-dime.jpg differ