From 765d03abb9f031a9d608edaeb0f0f1bd6eded591 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sun, 15 Dec 2013 23:12:31 +0000
Subject: build-0.2.6-svn1440.

---
 ChangeLog    | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac |  2 +-
 2 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7a7e456..039bc00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,77 @@
 
   ------------------------------------------------------------------
 
-  * build-0.2.6-svn14xx "Pirate Edition"
+  * build-0.2.6-svn1440 "Pirate Edition"
+  
+	2013-12-15
+	
+	src revision 1440
+
+	- Added autopilot goto/dock/formation support.
+	- Added NPC support.
+	- Added reputation support.
+	- Added explosion sound support.
+	- Added getting hit sound support.
+	- Improved HUD target indicators.
+	- Added star coronas to the map.
+	- Restored light attenuation values.
+	- Added support for NPC patrol routes.
+	- Added support for station weapons.
+	- Added 'wingmen' cheat.
+	- Added 'explode' cheat.
+	- Added 'give reputation' cheat.
+	- Increased beaming distance to 5km.
+	- Improved ship info.
+	- Sort ship weapons by location.
+	- Remove destroyed ships from the physics simulation.
+	- Nudge ships on launch to prevent spawning inside other objects.
+	- Support the 'infoname' key in zone ini files.
+	- Explosion particles bugfixes.
+	- Improved thrust triggered particle ejectors.
+	- General build fixes.
+	- Added --disable-error configure option.
+	- Added --enable-static-libc configure option.
+	- Added workaround for the bullet 2.82 compile warning.
+	
+	data revision 1067
+
+	- Added the Dagon system.
+	- Added the Ashran system,
+	- Added the Rasheen system,
+	- Added the Xibalba system,
+	- Added the Vostok system,
+	- Added planet Rasheen.
+	- Added planet Dagon.
+	- Use sky04 for the Alpha Kosiya system.
+	- Added sky29 to the Rasheen system.
+	- Added sky30 to the Kor Glaven system.
+	- Added sky31 to the Phoenicia system.
+	- Updated sky28 from the Praetoria system.
+	- Swapped skies from the Kronenbaden and Hellas systems.
+	- Introduced phospine gas cargo.
+	- Added Camorra Syndicate faction.
+	- Added Praetorian Express courier faction.
+	- Added Ryu Sengir faction.
+	- Updated the Antwerp system.
+	- Updated the Ghant system.
+	- Updated the Kronenbaden system.
+	- Updated the Finnmark system.
+	- Updated Praetorian space.
+	- Mount weapons on battleship Custodian.
+	- Added asteroid models.
+	- JMA ship updates.
+	- Improved Brisbane medical
+	- Updated weapon slots on the Matrix and the Raider.
+	- Added two extra location_cannons to Talon.
+	- Added turrets to the Goliath.
+	- Resized the Penchant.
+	- Updated the Manticore.
+	- Updated the Avatar.
+	- Improved engine exhaust particles.
+	- Replaced jump sound.
+	- Replaced mount sound.
+	- Added explosion sounds.
+	- Added liquor cargo model.
 
   * build-0.2.5-svn1328 "Particle Probe"
   
diff --git a/configure.ac b/configure.ac
index ff6cd2f..7714073 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl append SVN revision to the version number
 dnl determine the svn revision number
 define([svnversion], esyscmd([sh -c "echo -n 'svn'; svnversion|tr -d '\n'"]))
 
-AC_INIT([osirion], [0.2.5-svnversion])
+AC_INIT([osirion], [0.2.6-svnversion])
 
 AC_CONFIG_HEADERS(src/config.h)
 
-- 
cgit v1.2.3