[performous] 01/01: Merge branch 'experimental'
Markus Koschany
apo-guest at moszumanska.debian.org
Fri Apr 24 19:44:52 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository performous.
commit f2da911d70d67ff6bf99b0f9585dc25701fab224
Merge: d77e56b 9cd4477
Author: Markus Koschany <apo at gambaru.de>
Date: Fri Apr 24 21:07:57 2015 +0200
Merge branch 'experimental'
Conflicts:
debian/changelog
debian/patches/fix-imagemagick-detection.patch
debian/patches/series
.gitignore | 4 +-
CMakeLists.txt | 2 +-
cmake/Modules/FindAVResample.cmake | 2 -
data/config/controllers.xml | 46 +-
data/config/schema.xml | 10 +-
data/fonts/DroidSansMono.ttf | Bin 0 -> 78296 bytes
debian/README.source | 10 -
debian/changelog | 23 +
debian/control | 2 +-
debian/copyright | 8 +-
debian/patches/fix-hyphen-used-as-minus-sign.patch | 22 +
debian/patches/fix-imagemagick-detection.patch | 71 +-
debian/patches/fix-spelling-errors.patch | 118 ++
debian/patches/series | 2 +
debian/rules | 6 +
debian/source/options | 2 -
debian/watch | 3 +-
docs/Authors.txt | 1 +
game/3dobject.cc | 8 +-
game/3dobject.hh | 6 +-
game/animvalue.hh | 5 +-
game/audio.cc | 9 +-
game/audio.hh | 10 +-
game/controllers-keyboard.cc | 26 +-
game/ffmpeg.cc | 35 +-
game/ffmpeg.hh | 28 +-
game/guitargraph.cc | 1 -
game/main.cc | 22 +-
game/midifile.cc | 2 +
game/notegraph.cc | 4 +-
game/screen_audiodevices.cc | 4 +-
game/screen_intro.cc | 6 +-
game/screen_paths.cc | 15 +-
game/screen_players.cc | 18 +-
game/screen_playlist.cc | 2 +-
game/screen_sing.cc | 52 +-
game/screen_sing.hh | 1 -
game/screen_songs.cc | 18 +-
game/song.hh | 1 +
game/songparser.cc | 23 +-
game/songs.cc | 27 +-
game/songs.hh | 4 +-
game/textinput.hh | 16 -
game/video_driver.cc | 25 +-
game/video_driver.hh | 1 -
lang/README | 4 +-
lang/de.po | 1481 +++++++++++--------
lang/fi.po | 1519 +++++++++++---------
lang/fr.po | 469 +++---
osx-utils/performous-app-build.sh | 14 +-
osx-utils/performous.icns | Bin 193626 -> 0 bytes
osx-utils/resources/performous-launcher | 4 +-
.../performous/files/performous-0.7.0-libav.patch | 41 +
.../files/performous-20130811-gentoo.patch | 11 +
.../files/performous-20140927-cmake.patch | 115 ++
.../files/performous-20140927-libav.patch | 19 +
.../files/performous-20140927-linguas.patch | 25 +
.../games-arcade/performous/performous-9999.ebuild | 139 +-
tools/scripts/xml_gettext.sh | 48 +-
win32/cross-from-debian/.gitignore | 9 -
win32/cross-from-debian/README | 59 -
win32/cross-from-debian/Toolchain.cmake | 18 -
win32/cross-from-debian/copydlls.py | 116 --
win32/cross-from-debian/makebuilddir.sh | 4 -
win32/cross-from-debian/makedeps.sh | 703 ---------
win32/cross-from-debian/makepackage.py | 129 --
win32/gcc/README | 40 -
win32/gcc/gettext-0.17-variables.patch | 12 -
win32/gcc/install.sh | 349 -----
win32/gcc/mingw-cwchar.patch | 21 -
win32/gcc/mingw-libstdc++.patch | 15 -
win32/gcc/portaudio.patch | 175 ---
win32/msvc/fontconfig-cmake.patch | 24 -
win32/msvc/install-msvc.sh | 1391 ------------------
win32/mxe/libs.sh | 14 -
win32/mxe/make-installer.py | 68 +-
win32/mxe/make-mxe.sh | 9 +
win32/mxe/make-performous.sh | 44 +-
win32/mxe/settings.mk | 5 +
79 files changed, 2774 insertions(+), 5021 deletions(-)
diff --cc debian/patches/series
index d5ec694,b993c11..c64d197
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,4 +1,4 @@@
-fix-hyphen-used-as-minus-sign.patch
-fix-imagemagick-detection.patch
use-avconv.patch
+fix-imagemagick-detection.patch
++fix-hyphen-used-as-minus-sign.patch
+ fix-spelling-errors.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/performous.git
More information about the Pkg-games-commits
mailing list