← Back to branch summary

~ubuntu-branches/ubuntu/lucid/kmplayer/lucid

~ubuntu-branches/ubuntu/lucid/kmplayer/lucid

Viewing all changes in revision 33.

Committer: Bazaar Package Importer
Author(s): Jonathan Thomas
Date: 2010-03-05 08:35:53 UTC
mfrom: (1.1.14 upstream)
Revision ID: james.westby@ubuntu.com-20100305083553-dcjpc21lpto3oemy

Tags: 1:0.11.2-1ubuntu1

* Merge from Debian unstable, remaining change:
- Keep kmplayer-base transitional package for 8.04 upgrades

files added:
.pc

.pc/.version

.pc/02_sh4_support.diff

.pc/02_sh4_support.diff/src

.pc/02_sh4_support.diff/src/moz-sdk

.pc/02_sh4_support.diff/src/moz-sdk/prcpucfg.h

.pc/applied-patches

debian/patches/02_sh4_support.diff

debian/source

debian/source/format

src/Messages.sh

src/expression.cpp

src/expression.h

src/moz-sdk/npfunctions.h

src/npplayer.cpp

tests/books.xml

tests/clock.smil

tests/state-src.smil

tests/state.smil

files removed:
debian/README.source

debian/patches/01_rev1046843_link_with_X11.diff

icons/ox128-app-kmplayer.png

icons/ox16-app-kmplayer.png

icons/ox22-app-kmplayer.png

icons/ox32-app-kmplayer.png

icons/ox48-app-kmplayer.png

icons/ox64-app-kmplayer.png

icons/oxsc-app-kmplayer.svgz

src/moz-sdk/npupp.h

src/npplayer.c

files modified:
CMakeLists.txt

ChangeLog

debian/changelog

debian/control

debian/copyright

debian/patches/series

debian/rules

kmplayer.lsm

src/CMakeLists.txt

src/kmplayer.desktop

src/kmplayer_asx.cpp

src/kmplayer_asx.h

src/kmplayer_atom.cpp

src/kmplayer_atom.h

src/kmplayer_lists.cpp

src/kmplayer_lists.h

src/kmplayer_part.desktop

src/kmplayer_rp.cpp

src/kmplayer_rp.h

src/kmplayer_rss.cpp

src/kmplayer_rss.h

src/kmplayer_smil.cpp

src/kmplayer_smil.h

src/kmplayer_xspf.cpp

src/kmplayer_xspf.h

src/kmplayerapp.cpp

src/kmplayerconfig.cpp

src/kmplayerconfig.h

src/kmplayerpartbase.cpp

src/kmplayerpartbase.h

src/kmplayerplaylist.cpp

src/kmplayerplaylist.h

src/kmplayerprocess.cpp

src/kmplayerprocess.h

src/kmplayersource.h

src/kmplayertvsource.cpp

src/kmplayertvsource.h

src/mediaobject.cpp

src/moz-sdk/jni.h

src/moz-sdk/jni_md.h

src/moz-sdk/jri_md.h

src/moz-sdk/npapi.h

src/moz-sdk/npruntime.h

src/moz-sdk/nptypes.h

src/moz-sdk/obsolete/protypes.h

src/moz-sdk/prcpucfg.h

src/moz-sdk/prtypes.h

src/playlistview.cpp

src/playlistview.h

src/pref.cpp

src/pref.h

src/surface.cpp

src/surface.h

src/viewarea.cpp

src/viewarea.h

tests/animate.smil

tests/excl_timings.smil

tests/timings.smil

Show diffs side-by-side

added added

removed removed

.pc/02_sh4_support.diff/

.pc/02_sh4_support.diff/src/

.pc/02_sh4_support.diff/src/moz-sdk/

.pc/02_sh4_support.diff/src/moz-sdk/prcpucfg.h

.pc/applied-patches

debian/README.source

debian/changelog

debian/copyright

debian/patches/01_rev1046843_link_with_X11.diff

debian/patches/02_sh4_support.diff

debian/patches/series

debian/source/format

icons/ox128-app-kmplayer.png

icons/ox16-app-kmplayer.png

icons/ox22-app-kmplayer.png

icons/ox32-app-kmplayer.png

icons/ox48-app-kmplayer.png

icons/ox64-app-kmplayer.png

icons/oxsc-app-kmplayer.svgz

src/CMakeLists.txt

src/Messages.sh

src/expression.cpp

src/expression.h

src/kmplayer.desktop

src/kmplayer_asx.cpp

src/kmplayer_asx.h

src/kmplayer_atom.cpp

src/kmplayer_atom.h

src/kmplayer_lists.cpp

src/kmplayer_lists.h

src/kmplayer_part.desktop

src/kmplayer_rp.cpp

src/kmplayer_rp.h

src/kmplayer_rss.cpp

src/kmplayer_rss.h

src/kmplayer_smil.cpp

src/kmplayer_smil.h

src/kmplayer_xspf.cpp

src/kmplayer_xspf.h

src/kmplayerapp.cpp

src/kmplayerconfig.cpp

src/kmplayerconfig.h

src/kmplayerpartbase.cpp

src/kmplayerpartbase.h

src/kmplayerplaylist.cpp

src/kmplayerplaylist.h

src/kmplayerprocess.cpp

src/kmplayerprocess.h

src/kmplayersource.h

src/kmplayertvsource.cpp

src/kmplayertvsource.h

src/mediaobject.cpp

src/moz-sdk/jni.h

src/moz-sdk/jni_md.h

src/moz-sdk/jri_md.h

src/moz-sdk/npapi.h

src/moz-sdk/npfunctions.h

src/moz-sdk/npruntime.h

src/moz-sdk/nptypes.h

src/moz-sdk/npupp.h

src/moz-sdk/obsolete/protypes.h

src/moz-sdk/prcpucfg.h

src/moz-sdk/prtypes.h

src/npplayer.cpp

src/playlistview.cpp

src/playlistview.h

src/surface.cpp

src/viewarea.cpp

tests/animate.smil

tests/books.xml

tests/clock.smil

tests/excl_timings.smil

tests/state-src.smil

tests/state.smil

tests/timings.smil

Older »