diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2005-05-05 11:04:18 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2005-05-05 11:04:18 +0200 |
| commit | 87754197797394cf5934f6fddbb5a078894f1607 (patch) | |
| tree | d452590f23e48c2d7ff044d43e1b3f2396681bdd | |
| parent | f1494502a736ef07cd37786f63a9478d5ed89341 (diff) | |
| download | vdr-87754197797394cf5934f6fddbb5a078894f1607.tar.gz vdr-87754197797394cf5934f6fddbb5a078894f1607.tar.bz2 | |
Now including the optional user defined Make.config from the 'libsi' Makefile
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 5 | ||||
| -rw-r--r-- | config.h | 6 | ||||
| -rw-r--r-- | libsi/Makefile | 4 |
4 files changed, 12 insertions, 4 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 26d52c49..9693009e 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1303,6 +1303,7 @@ Roman Krenický <free-rtk@gmx.de> Ville Skyttä <ville.skytta@iki.fi> for reporting several compiler warnings in gcc 4.0 + for including the optional user defined Make.config from the 'libsi' Makefile Steffen Beyer <cpunk@reactor.de> for fixing setting the colored button help after deleting a recording in case the next @@ -3473,3 +3473,8 @@ Video Disk Recorder Revision History than 30 seconds. - Added a missing cMutexLock to cRemote::HasKeys() (thanks to Wolfgang Rohdewald). - All log entries regarding timers now contain a short description of the timer. + +2005-05-05: Version 1.3.24 + +- Now including the optional user defined Make.config from the 'libsi' Makefile + (thanks to Ville Skyttä). @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 1.216 2005/03/05 15:44:35 kls Exp $ + * $Id: config.h 1.217 2005/05/05 11:04:18 kls Exp $ */ #ifndef __CONFIG_H @@ -20,8 +20,8 @@ #include "i18n.h" #include "tools.h" -#define VDRVERSION "1.3.23" -#define VDRVERSNUM 10323 // Version * 10000 + Major * 100 + Minor +#define VDRVERSION "1.3.24" +#define VDRVERSNUM 10324 // Version * 10000 + Major * 100 + Minor #define MAXPRIORITY 99 #define MAXLIFETIME 99 diff --git a/libsi/Makefile b/libsi/Makefile index 2d8713b3..fdc630d2 100644 --- a/libsi/Makefile +++ b/libsi/Makefile @@ -1,7 +1,7 @@ # # Makefile for a libsi # -# $Id: Makefile 1.3 2004/10/16 13:31:50 kls Exp $ +# $Id: Makefile 1.4 2005/05/05 11:01:46 kls Exp $ ### The C++ compiler and options: @@ -11,6 +11,8 @@ AR = ar ARFLAGS = ru RANLIB = ranlib +-include ../Make.config + ### The directory environment: INCLUDES += |