[vdr-plugin-undelete] 02/05: Merge tag 'upstream/0.0.7+git20150214'
Tobias Grimm
tiber-guest at moszumanska.debian.org
Sat Feb 14 14:31:40 UTC 2015
This is an automated email from the git hooks/post-receive script.
tiber-guest pushed a commit to branch master
in repository vdr-plugin-undelete.
commit 976e83a6933403f8e93c1c9f51251223f6b6f74e
Merge: 97a15dc 7606cf3
Author: etobi <git at e-tobi.net>
Date: Sat Feb 14 15:27:58 2015 +0100
Merge tag 'upstream/0.0.7+git20150214'
Upstream version 0.0.7+git20150214
Conflicts:
HISTORY
Makefile
README
menuundelete.c
undelete.c
.gitignore | 7 +++++
HISTORY | 12 +++++++
Makefile | 92 ++++++++++++++++++++++++++++--------------------------
README | 18 ++++++++---
menunoselectitem.h | 10 +-----
menutext.c | 36 ---------------------
menutext.h | 23 --------------
menuundelete.c | 50 +++++++----------------------
menuundelete.h | 4 ---
undelete.c | 81 ++++++++++++++++-------------------------------
undelete.h | 24 +++-----------
vdrtools.c | 29 -----------------
vdrtools.h | 14 ---------
13 files changed, 126 insertions(+), 274 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-undelete.git
More information about the pkg-vdr-dvb-changes
mailing list