[mupen64plus-ui-console] 166/172: 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-ui-console.

commit ef2d8f7743d2acd8197327a8cf8845c968091de6
Merge: 023b244 4b3e457
Author: Sven Eckelmann <sven at narfation.org>
Date:   Tue Apr 28 22:11:03 2015 +0200

    Merge branch 'experimental'

 .gitattributes                                 |   38 +
 .gitignore                                     |    2 +
 .travis.yml                                    |   12 +
 data/icons/48x48/apps/mupen64plus.png          |  Bin 0 -> 3249 bytes
 data/icons/scalable/apps/mupen64plus.svg       | 1478 ++++++++++++++++++++++++
 {debian => data}/mupen64plus.desktop           |    3 +-
 debian/changelog                               |   10 +
 debian/mupen64plus-ui-console.install          |    4 +-
 debian/patches/make_header_depends.patch       |   26 -
 debian/patches/series                          |    1 -
 doc/mupen64plus.6                              |  317 ++---
 projects/msvc11/mupen64plus-ui-console.sln     |  110 +-
 projects/msvc11/mupen64plus-ui-console.vcxproj |  284 ++---
 projects/msvc8/mupen64plus-ui-console.sln      |  112 +-
 projects/msvc8/mupen64plus-ui-console.vcproj   |  522 ++++-----
 projects/unix/Makefile                         |   48 +-
 src/main.c                                     |   18 +
 src/osal_dynamiclib_win32.c                    |  150 +--
 src/osal_files_win32.c                         |  212 ++--
 src/osal_preproc.h                             |    5 +
 20 files changed, 2467 insertions(+), 885 deletions(-)


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