diff options
| author | Michael Brückner <mb (plus) vdr (at) gekrumbel (dot) de> | 2008-01-10 22:47:14 +0100 |
|---|---|---|
| committer | Michael Brückner <mb (plus) vdr (at) gekrumbel (dot) de> | 2008-01-10 22:47:14 +0100 |
| commit | f4015fe172ffb3911a7dd20693bef18054e8e8ed (patch) | |
| tree | 6a2cad83b2a9ea0a12b6b5fecdf9c986e295b10d /epgsearch.h | |
| parent | 6316fbc396edd30cb09fc2dd8ae7a823bf3a4b6a (diff) | |
| parent | 3622feae8b1326b1782190ae243b45255693c332 (diff) | |
| download | vdr-plugin-live-f4015fe172ffb3911a7dd20693bef18054e8e8ed.tar.gz vdr-plugin-live-f4015fe172ffb3911a7dd20693bef18054e8e8ed.tar.bz2 | |
Merge branch 'master' of castle:~git/live
Diffstat (limited to 'epgsearch.h')
| -rw-r--r-- | epgsearch.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/epgsearch.h b/epgsearch.h index 4519490..51c73cf 100644 --- a/epgsearch.h +++ b/epgsearch.h @@ -375,6 +375,7 @@ public: iterator end() { return m_list.end(); } const_iterator end() const { return m_list.end(); } + void merge(SearchResults& r) {m_list.merge(r.m_list); m_list.sort();} static std::string AddQuery(std::string const& query); static std::string PopQuery(std::string const& md5); private: |