From a66de0d812bcde4acb4bf5ce89cafb59510196f8 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Fri, 23 Oct 2009 14:42:41 +0000 Subject: [PATCH] Small fixes, preparing 4.7 git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@449 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 6 +++--- fhem/Makefile | 8 ++++---- fhem/docs/fritzbox.html | 25 ++++++++++++++----------- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 5f8699507..a70ae9b62 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -493,7 +493,7 @@ - feature: Cost Control in 15_CUL_EM (CostPerUnit, BasisFeePerMonth) - feature: add counter differential per time in 81_M232Counter.pm - feature: added USB compendium to documentation - - feature: pgm3: Documentation for pgm3 updated, HMS100CO added (and bugfixes) + - feature: pgm3: Documentation for pgm3 updated, HMS100CO added (and bugfix) - bugfix: Defining a repeated at job in a sunrise/sunset at job fails - bugfix: FHT "summer" fix (avoiding a lot of syncnow) - feature: FHEMWEB modules added @@ -516,7 +516,7 @@ - bugfix: Reattached corrupted CUL device caused uninitialized message - bugfix: CUL/HMS changes, HMS cleanup - bugfix: EM/EMWZ/EMGZ set changed to work in FHEMWEB - - bugfix: Avoid unitialized in xmllist for corrupt readings (reporter: Boris) + - bugfix: Avoid unitialized in xmllist for corrupt readings, reporter Boris - bugfix: Add binmode to 01_fhemweb.pm for windows - bugfix: Uniform check for windows, enable CUL for windows. - bugfix: CUL/HMS parsing patches from Peter @@ -526,7 +526,7 @@ - feature: suppress inplausible readings from USF1000 - feature: get time, fwrev, set reopen for CM11 (Boris 2009-09-12) - bugfix: FHZ_ReadAnswer bugfix for Windows (Klaus, 20.8.2009) - - feature: CUL: device acces code reorganized, TCP/IP support added + - feature: CUL: device access code reorganized, TCP/IP support added (CUN) - feature: Pachube module from Axel - feature: dumpdef module from Axel in contrib - feature: javascripting support in FHEMWEB (Klaus/Axel) diff --git a/fhem/Makefile b/fhem/Makefile index cb9e2ffef..160feac9b 100644 --- a/fhem/Makefile +++ b/fhem/Makefile @@ -2,8 +2,8 @@ BINDIR=/usr/local/bin MODDIR=/usr/local/lib VARDIR=/var/log/fhem -VERS=4.6 -DATE=2009-07-03 +VERS=4.7 +DATE=2009-09-26 all: @echo Nothing to do for all. @@ -39,8 +39,8 @@ install-base: dist: @echo Version is $(VERS), Date is $(DATE) mkdir .f - cp -r CHANGED FHEM HISTORY Makefile README.CVS em1010pc\ - TODO contrib docs examples fhem.pl test webfrontend .f + cp -r CHANGED FHEM HISTORY Makefile README.CVS\ + TODO contrib docs examples fhem.pl webfrontend .f find .f -name CVS -print | xargs rm -rf find .f -name \*.orig -print | xargs rm -f find .f -name .#\* -print | xargs rm -f diff --git a/fhem/docs/fritzbox.html b/fhem/docs/fritzbox.html index 750db989a..dda4ab778 100644 --- a/fhem/docs/fritzbox.html +++ b/fhem/docs/fritzbox.html @@ -81,20 +81,23 @@

Description for the Fritzbox 7270 from Volker

Links