merge stable

diff --cc HISTORY
index c5f91ab7c6f2730f93c9fd2892705a41fbd9de47,1aa43875b8885fee9e7155d6d505530ea75bc0c6..0dbe586d5a4dd4f715fa1f9999c1d4ff92a79b51
--- 1/HISTORY
--- 2/HISTORY
+++ b/HISTORY
@@@ -1,20 -1,21 +1,35 @@@
  VDR Plugin 'sc' Revision History
  --------------------------------
  
 +..2009: Version 1.0.0
 +- Forked development branch.
 +- Now operating like a real CAM. All necessary information are derieved from the
 +  CAM messages send by VDR (i.e. no more GetCaDescriptors).
 +- Added a real CCcam network client (experimental). CCcam doesn't need to run on
 +  localhost. The client name is cccam2, see cardclient.conf.example file.
 +- Reworked CA message buffer handling. Removed fixed size buffers and fixed
 +  several buffer overflows.
 +- Added a copy of opensasc-ng to the contrib directory. In place compile with
 +  current vdr-sc/FFdecsa code supported.
 +- Support for VDR 1.4.7 is declared deprecated.
 +
 +------------------------------------------------------------
 +
+ 07.10.2009: Version 0.9.3
+ - Ported from Emunation:
+     * Improve msg handling in cardclient newcamd
+     * Add support for seca provider 64 (spain)
+     * A bunch of Nagra updates, mainly map related
+     * fix CAID range in smartcard Nagra
+ - Ported from oscam (R127):
+     * Add pin handling in smartcard Conax
+     * Update ECM handling in smartcard Seca
+     * Update ECM/EMM handling in smartcard Viaccess
+ - Fix large file options for TSplay patch
+ - Various bugfixes and translation updates.
+ - The 0.9.x branch is now frozen, only bugfixes will be applied.
+ - For a detailed list of changes, refer to the HG changelog.
+ 
  04.07.2009: Version 0.9.2
  - Restructure of smartcard code. Configuration has been moved to cardslot.conf.
    See cardslot.conf.example file.

diff --cc Makefile
Simple merge