This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch armhf_test in repository mupen64plus-video-rice.
commit ceaf14b24b9ebd4b84cf1fe715c15f6f732725cc Author: Sven Eckelmann <[email protected]> Date: Fri Sep 5 12:20:38 2014 +0200 Remove upstream merged patches --- debian/changelog | 2 ++ debian/patches/series | 1 - debian/patches/tnt_cominber.patch | 16 ---------------- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 625c2e6..3f34bc6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ mupen64plus-video-rice (2.0+57+g134f5dc-1) UNRELEASED; urgency=medium * New Upstream Snapshot from 134f5dc1e7d12fb4996a1129b63861174596777c + * debian/patches: + - Remve upstream merged tnt_cominber.patch -- Sven Eckelmann <[email protected]> Fri, 05 Sep 2014 12:19:25 +0200 diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 9c8a9d9..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -tnt_cominber.patch diff --git a/debian/patches/tnt_cominber.patch b/debian/patches/tnt_cominber.patch deleted file mode 100644 index 9c9a8da..0000000 --- a/debian/patches/tnt_cominber.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: add missing break statement for CM_FMT_TYPE_NOT_USED -Author: Richard Goedeken <[email protected]> - ---- -diff --git a/src/CNvTNTCombiner.cpp b/src/CNvTNTCombiner.cpp -index c79b4a241db891e050500607dede12f7bc028146..0cd62dbb25c10823edb37ad2a04b0ec8dfe24f4c 100644 ---- a/src/CNvTNTCombiner.cpp -+++ b/src/CNvTNTCombiner.cpp -@@ -76,6 +76,7 @@ int CNvTNTCombiner::ParseDecodedMux() - comb.arg1 = MUX_1; - comb.arg2 = MUX_0; - comb.arg3 = MUX_1; -+ break; - case CM_FMT_TYPE_D: // = A - comb.arg0 = m.d; - comb.arg1 = MUX_1; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-rice.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
