From: R. Steve McKown <rsmckown@gmail.com>
Date: Mon, 7 Dec 2009 18:03:18 +0000 (-0700)
Subject: Merge branch 'release/2.1.0' into debian/2.1.0 (at 2.1.0-3)
X-Git-Tag: debian/2.1.0-3-1tinyos1~2
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=2b26569a0d72a9f081a70a07a5736436bd06924a

Merge branch 'release/2.1.0' into debian/2.1.0 (at 2.1.0-3)
---

2b26569a0d72a9f081a70a07a5736436bd06924a
diff --cc .gitignore
index 6c7e5753,93b03677..3587edeb
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,5 +1,6 @@@
+ *.swp
+ *.class
+ support/sdk/java/net/tinyos/message/SerialPacket.java
+ support/sdk/java/net/tinyos/packet/Serial.java
+ support/sdk/java/net/tinyos/tools/PrintfMsg.java
 +/debian/control