summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2008-01-16 01:01:50 +0100
committerDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2008-01-16 01:01:50 +0100
commit2419f84715e74676c0de87c95a99223870323f02 (patch)
treeed9dd7c3d80d75a777c6a4b5a060f244615b183c /doc
parent7b630c706db7b2a7ef4529bb65e695ebec5d3467 (diff)
parente74f6bd540102bc23bb8d8e3d87fd3831e712503 (diff)
downloadvdr-plugin-live-2419f84715e74676c0de87c95a99223870323f02.tar.gz
vdr-plugin-live-2419f84715e74676c0de87c95a99223870323f02.tar.bz2
Merge branch 'master' into devel
Diffstat (limited to 'doc')
-rw-r--r--doc/ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 4786f65..60341f1 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-15 Christian Wieninger <cwieninger at gmx dot de>
+ * whats_on.ecpp: added listing 'Favorites', that lists all search
+ results of search timers with setting 'Use in favorites menu'
+ * Makefile: reversed Makefile changes that avoided commit conflicts,
+ but caused compile time problems
+ * po/*.po: added "translation team" since msgfmt complains about that
+
2008-01-04 Dieter Hametner <dh+vdr at gekrumbel dot de>
* Makefile: Thanks to user 'ernie' in vdr-portal.de, who pointed