Merged changelog and release history into a single file

2 files changed, 71 insertions, 63 deletions

diff --git a/ChangeLog b/ChangeLog
index 7e162dd..b2717d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,73 @@
 
-revision xyz "Bullet in the Sky"
+Project::OSiRiON - Changelog and release history
+
+
+* release-0.2.0-svn827 (win32 only)
+
+	2010-10-16
+	src revision 827
+
+	- bugfix release for the broken win32 r825
+
+* release-0.2.0-svn825 "November Rain"
+
+	2010-10-15
+	src revision 825
+	data revision 490
+
+	- VBO support
+	- scalable models
+	- world updates and new skyboxes
+
+* release-0.2.0-svn754 "Broken Skies"
+
+	2010-10-06
+	src revision 754
+	data revision 451
+
+	- replaces skyglobes with skyboxes
+
+* release-0.1.0-svn740
+
+	2010-09-26
+	src revision 740
+	data revision 441
+
+* release-0.1.0-svn716
+
+	2010-03-05
+	src revision 716
+	data revision 422
+
+* release-0.1.0-svn669
+
+	2009-08-13
+	src revision 669
+	data revision 371
+
+* release-0.1.0-svn641
+
+	2009-06-28
+	src revision 641
+	data revision 326
+
+* release-0.1.0-svn560
+
+	src revision 560
+	data revision 261
+
+* release-0.1.0-svn523
+
+	src revision 523
+	data revision 217
+
+* release-0.1.0-svn488
+
+	src revision 488
+	data revision 174
+
+* release-0.1.0-svn418
+
+	src revision 418
+	data revision 144
 
-revision 754 "Broken Skies"
-  - replaced skyglobes with skyboxes
\ No newline at end of file
diff --git a/developer/HISTORY b/developer/HISTORY
deleted file mode 100644
index 6c40b34..0000000
--- a/developer/HISTORY
+++ /dev/null
@@ -1,60 +0,0 @@
-
-Project::OSiRiON - Release history
-
-
-* release-0.2.0-svn825 "November Rain"
-
-	2010-10-15
-	src revision 825
-	data revision 490
-
-* release-0.2.0-svn754 "Broken Skies"
-
-	2010-10-06
-	src revision 754
-	data revision 451
-
-* release-0.1.0-svn740
-
-	2010-09-26
-	src revision 740
-	data revision 441
-
-* release-0.1.0-svn716
-
-	2010-03-05
-	src revision 716
-	data revision 422
-
-* release-0.1.0-svn669
-
-	2009-08-13
-	src revision 669
-	data revision 371
-
-* release-0.1.0-svn641
-
-	2009-06-28
-	src revision 641
-	data revision 326
-
-* release-0.1.0-svn560
-
-	src revision 560
-	data revision 261
-
-* release-0.1.0-svn523
-
-	src revision 523
-	data revision 217
-
-* release-0.1.0-svn488
-
-	src revision 488
-	data revision 174
-
-* release-0.1.0-svn418
-
-	src revision 418
-	data revision 144
-