* Release XXV-1.2

2 files changed, 15 insertions, 1 deletions

diff --git a/bin/xxvd b/bin/xxvd
index 4f31aa2..28b12e0 100755
--- a/bin/xxvd
+++ b/bin/xxvd
@@ -42,7 +42,7 @@ $|++;
 
 my $REV = (split(/ /, '$Revision$'))[1];
 my $MODULES;
-my $VERSION = '1.2';
+my $VERSION = '1.2'; 
 my $VDRVERSION = 0;
 my $DBVERSION = 0;
 my $CLEANUP;
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 47eed7c..5124534 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,3 +1,17 @@
+1.2 - Stable release
+--------------------------------------------------------------------------------
+
+* Fix typos
+* debian-install.sh missed by pakaging
+* HTTPD: deliver static html pages never as attachment
+* RECORDS: rdelete group of recording, join double SQL-query to single query
+* REPORT: dump date with common format
+* TIMER: Warn if try to edit a none exist timer.
+* VTX: get font failed with wrong parameter
+* alist/clist/rlist: reorder sorting parameter, remove double sql query
+* report: RECORDS - status message with wrong id
+* rlist: move time formating from template to perl code
+
 1.1 - Feature release (Release candidate)
 --------------------------------------------------------------------------------