[mupen64plus-video-glide64] 39/172: Rebase patches against 1.99.4~hg20101124

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus-video-glide64.

commit 3ee3d15133ecfd69afac5f631541d9fb63a0ce49
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Fri Nov 26 11:59:09 2010 +0100

    Rebase patches against 1.99.4~hg20101124
---
 debian/patches/printf_fixup.patch | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/patches/printf_fixup.patch b/debian/patches/printf_fixup.patch
index 6640b5d..7a784d9 100644
--- a/debian/patches/printf_fixup.patch
+++ b/debian/patches/printf_fixup.patch
@@ -62,14 +62,14 @@ index fc22fbf157b7c9e1507c6a2430268afc71d4c4f8..af6e1bbb8be0772b38eeee282b9ee459
 --- a/src/m64p.h
 +++ b/src/m64p.h
 @@ -28,7 +28,7 @@
- #include "m64p_vidext.h"
- #include <stdio.h>
- 
--void WriteLog(m64p_msg_level level, const char *msg, ...);
-+void WriteLog(m64p_msg_level level, const char *msg, ...) __attribute__ ((format (printf, 2, 3)));
- 
- //The Glide API originally used an integer to pick an enumerated resolution.
- //To accomodate arbitrary resolutions, pack it into a 32-bit struct
+ #include "m64p_vidext.h"
+ #include <stdio.h>
+ 
+-void WriteLog(m64p_msg_level level, const char *msg, ...);
++void WriteLog(m64p_msg_level level, const char *msg, ...) __attribute__ ((format (printf, 2, 3)));
+ 
+ //The Glide API originally used an integer to pick an enumerated resolution.
+ //To accomodate arbitrary resolutions, pack it into a 32-bit struct
 diff --git a/src/wrapper/combiner.cpp b/src/wrapper/combiner.cpp
 index 6f2f189083942180eb331d155ea84494ddbeb84f..484a880f4a0d07dfc55c64200d5487b22b7f90c1 100644
 --- a/src/wrapper/combiner.cpp

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-glide64.git