[SCM] osgearth branch, natty, updated. debian/1.4.1-1-31-g7c9d436

[Pirmin Kalberer]

The following commit has been merged in the natty branch:
commit 7c9d436d40782c017a343d742c772cec21fa3bc9
Merge: 156994ef31f4ee17b2774c826dfaf6673c44dff8 0222af1ed465032d100b2ff709c84c30a745c5c5
Author: Pirmin Kalberer <pka at sourcepole.ch>
Date:   Mon Dec 5 22:07:28 2011 +0100

    Merge branch 'master' into natty
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index e1787a2,5050a4b..0da40fd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,14 @@@
- osgearth (2.0-4~natty1) natty; urgency=low
++osgearth (2.1.1+dfsg-1~natty1) natty; urgency=low
 +
-   * Launchpad build for natty.
++  * Launchpad build for natty
 +
-  -- Pirmin Kalberer <pi_deb at sourcepole.ch>  Wed, 10 Aug 2011 23:44:48 +0200
++ -- Pirmin Kalberer <pi_deb at sourcepole.ch>  Mon, 05 Dec 2011 21:44:08 +0100
++
+ osgearth (2.1.1+dfsg-1) unstable; urgency=low
+ 
+   * Upstream release 2.1.1
+ 
+  -- Pirmin Kalberer <pi_deb at sourcepole.ch>  Wed, 30 Nov 2011 22:27:40 +0100
  
  osgearth (2.0-4) unstable; urgency=low
  

-- 
osgEarth terrain rendering toolkit