From: R. Steve McKown <rsmckown@gmail.com>
Date: Tue, 8 Dec 2009 21:58:32 +0000 (-0700)
Subject: Merge commit 'bc54b6cd239fe6f2a54b2fe2a1739ab58bde19e0' into debian/2.1.0
X-Git-Tag: debian/2.1.1-4.3-1tmi~7^2~6
X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=commitdiff_plain;h=3dc35b6de307c5caf10a70f3a61d707d0b6be2e8;hp=bc54b6cd239fe6f2a54b2fe2a1739ab58bde19e0;p=tinyos-2.x.git

Merge commit 'bc54b6cd239fe6f2a54b2fe2a1739ab58bde19e0' into debian/2.1.0

Conflicts:
	debian/changelog
---

diff --git a/changelog b/changelog
index 3b648e93..9ae1e85b 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,6 @@
-tinyos (2.0.1-2tmi) hardy; urgency=low
+tinyos (2.1.0-3-2tmi) hardy; urgency=low
 
-  * Package tinyOS upstream release 2.0.1.
+  * Package TMI release 2.1.0-3, based on official tinyOS release 2.1.0.
   * Package is now signed.
 
- -- TMI Packages <pkgs@titaniummirror.com>  Tue, 08 Dec 2009 14:08:03 -0700
+ -- TMI Packages <pkgs@titaniummirror.com>  Tue, 08 Dec 2009 14:57:46 -0700