[mupen64plus-rsp-hle] 161/167: Merge branch 'experimental'

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-rsp-hle.

commit 75923ffd5fef0eca550856b4fcef24c617709c1f
Merge: a45cb24 0ff16ea
Author: Sven Eckelmann <sven at narfation.org>
Date:   Tue Apr 28 22:13:18 2015 +0200

    Merge branch 'experimental'
    
    Conflicts:
    	debian/copyright

 .gitattributes                                  |  38 +
 .gitignore                                      |   2 +
 .travis.yml                                     |  13 +
 debian/changelog                                |  22 +
 debian/copyright                                |   2 +
 debian/patches/jpeg_dispatching_278b0.patch     |  20 -
 debian/patches/jpeg_memory_alloc_reduce.patch   |  36 -
 debian/patches/jpeg_memory_alloc_refactor.patch | 152 ----
 debian/patches/jpeg_memory_alloc_stack.patch    |  40 -
 debian/patches/musyx_initial.patch              | 892 ---------------------
 debian/patches/series                           |   5 -
 projects/msvc11/mupen64plus-rsp-hle.vcxproj     | 236 +++---
 projects/msvc8/mupen64plus-rsp-hle.vcproj       | 518 +++++++------
 projects/unix/Makefile                          |  53 +-
 src/alist.c                                     | 948 ++++++++++++++++++++++-
 src/alist.h                                     | 145 +++-
 src/alist_audio.c                               | 307 ++++++++
 src/alist_naudio.c                              | 321 ++++++++
 src/alist_nead.c                                | 523 +++++++++++++
 src/{jpeg.h => arithmetics.h}                   |  22 +-
 src/audio.c                                     | 128 +++
 src/{alist_internal.h => audio.h}               |  53 +-
 src/cicx105.c                                   |  17 +-
 src/{cicx105.h => common.h}                     |  20 +-
 src/hle.c                                       | 442 +++++++++++
 src/hle.h                                       |  91 +--
 src/{alist.h => hle_external.h}                 |  23 +-
 src/{alist_internal.h => hle_internal.h}        |  76 +-
 src/jpeg.c                                      | 489 +++++-------
 src/main.c                                      | 476 ------------
 src/{cicx105.c => memory.c}                     |  73 +-
 src/memory.h                                    | 185 +++++
 src/mp3.c                                       | 684 ++++++++++++++++
 src/{alist.h => msvc-compat/stdbool.h}          |  24 +-
 src/musyx.c                                     | 985 ++++++++++++++++++++++++
 src/plugin.c                                    | 221 ++++++
 src/ucode1.cpp                                  | 951 -----------------------
 src/ucode2.cpp                                  | 930 ----------------------
 src/ucode3.cpp                                  | 834 --------------------
 src/ucode3mp3.cpp                               | 604 ---------------
 src/ucodes.h                                    | 146 ++++
 41 files changed, 5906 insertions(+), 5841 deletions(-)

diff --cc debian/changelog
index e24472b,9580fcf..9e443ac
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,25 +1,34 @@@
+ mupen64plus-rsp-hle (2.0+169+g6158876-2) UNRELEASED; urgency=medium
+ 
+   * Update debian/copyright
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Sun, 28 Sep 2014 21:52:01 +0200
+ 
+ mupen64plus-rsp-hle (2.0+169+g6158876-1) experimental; urgency=medium
+ 
+   * New Upstream Snapshot from 6158876a2132a2e9adb45d035489938ac9dea5dc
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Fri, 05 Sep 2014 11:15:24 +0200
+ 
+ mupen64plus-rsp-hle (2.0+158+g889a070-1) experimental; urgency=medium
+ 
+   * New Upstream Snapshot from 889a0707a5e1ce0197024789a6f7fc1e0a093a99
+   * debian/patches:
+     - Remove upstream merged jpeg_dispatching_278b0.patch,
+       jpeg_memory_alloc_reduce.patch, jpeg_memory_alloc_refactor.patch,
+       jpeg_memory_alloc_stack.patch, musyx_initial.patch
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Sat, 05 Apr 2014 14:23:04 +0200
+ 
 +mupen64plus-rsp-hle (2.0-4) UNRELEASED; urgency=medium
 +
 +  * Upgraded to policy 3.9.6, no changes required
 +  * debian/copyright:
 +    - Update years
 +    - Fix errors in paths to specific files
 +
 + -- Sven Eckelmann <sven at narfation.org>  Sat, 20 Sep 2014 11:04:40 +0200
 +
  mupen64plus-rsp-hle (2.0-3) unstable; urgency=medium
  
    * debian/rules:
diff --cc debian/copyright
index f91da23,047ce98..1aa38c0
--- a/debian/copyright
+++ b/debian/copyright
@@@ -12,14 -12,9 +12,16 @@@ Files: projects/unix/Makefil
  Copyright: 2007-2008, Jesse 'DarkJezter' Dean
             2007-2008, Scott 'Tillin9' Knauert
             2008-2009, Richard 'Richard42' Goedeken <Richard at fascinationsoftware.com>
+            2014, Bobby Smiles
  License: GPL-2+
  
 +Files: src/jpeg.c src/main.c src/alist.c src/cicx105.c
 +Copyright: 2002, Hacktarux
 +           2009, Richard 'Richard42' Goedeken <Richard at fascinationsoftware.com>
 +           2012, Bobby Smiles
++           2014, Bobby Smiles
 +License: GPL-2+
 +
  Files: src/hle.h
  Copyright: 2002, Hacktarux
  License: GPL-2+

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