[chirp/f16: 11/11] Commit updates.

[Richard Shaw]

commit 42e3925b01c4dfbee4a591f130b296b2ad7a4ff6
Merge: 798a598 2a0e297
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Mon Mar 19 15:56:30 2012 -0500

    Commit updates.

 .gitignore |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)
---
diff --cc .gitignore
index 5637b13,f6a82f9..a5f602f
--- a/.gitignore
+++ b/.gitignore
@@@ -1,5 -1,2 +1,1 @@@
--/chirp-0.1.12.tar.gz
- <<<<<<< HEAD
- =======
--/chirp-0.2.0.tar.gz
- >>>>>>> master
++chirp-0.2.0.tar.gz