diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-06-12 02:33:43 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-06-12 02:33:43 +0100 |
| commit | c98a025193cd6aa8c8c8cc1cf3404b5f7b9251e1 (patch) | |
| tree | 36476aac55d5037a8d2f49497c67e593a1be1e19 | |
| parent | 3b80ae534dbba2eb355d1ede99e92b5431a7e3aa (diff) | |
| parent | ecd1d68fa6221278496fedef976acf72888de6e0 (diff) | |
| download | xine-lib-c98a025193cd6aa8c8c8cc1cf3404b5f7b9251e1.tar.gz xine-lib-c98a025193cd6aa8c8c8cc1cf3404b5f7b9251e1.tar.bz2 | |
Merge from 1.1.
--HG--
rename : include/xine.h.in => include/xine.h
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | include/xine.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 29f4db045..41e87bed1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ xine-lib-1.2 (1.2.0~hg-0) experimental; urgency=low -- Darren Salt <linux@youmustbejoking.demon.co.uk> Tue, 17 Apr 2007 16:50:37 +0100 -xine-lib (1.1.12~hg-0) unstable; urgency=low +xine-lib (1.1.13~hg-0) unstable; urgency=low [ Darren Salt ] * Hg snapshot. diff --git a/include/xine.h b/include/xine.h index 9df9fceae..f3c79a7b4 100644 --- a/include/xine.h +++ b/include/xine.h @@ -805,7 +805,7 @@ char *const *xine_get_log (xine_t *self, int buf) XINE_PROTECTED; /* log callback will be called whenever something is logged */ typedef void (*xine_log_cb_t) (void *user_data, int section); void xine_register_log_cb (xine_t *self, xine_log_cb_t cb, - void *user_data) XINE_PROTECTED XINE_DEPRECATED; + void *user_data) XINE_PROTECTED; /* * error handling / engine status |