[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bphonon=5D_/=3A_Merge_branch_=27master=27_of_git=2Ek?=
From:       Trever Fischer <wm161 () wm161 ! net>
Date:       2011-02-21 23:50:06
Message-ID: 20110221235006.A5117A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit bcecdf48e50f5cf957df748e6cfeb684721665dc by Trever Fischer.
Committed on 22/02/2011 at 00:49.
Pushed by tdfischer into branch 'master'.

Merge branch 'master' of git.kde.org:phonon

I  +8    -2    CMakeLists.txt     
I  +5    -0    demos/CMakeLists.txt     
I  +21   -0    demos/captureapp/CMakeLists.txt     
I  +176  -0    demos/captureapp/captureapp.cpp     
I  +71   -0    demos/captureapp/captureapp.h     
I  +44   -0    demos/captureapp/captureapp_main.cpp     
I  +21   -0    demos/captureapp2/CMakeLists.txt     
I  +148  -0    demos/captureapp2/captureapp2.cpp     
I  +72   -0    demos/captureapp2/captureapp2.h     
I  +47   -0    demos/captureapp2/captureapp2_main.cpp     
I  +20   -0    demos/simpleplayer/main.cpp     
I  +24   -3    demos/simpleplayer/player.cpp     
I  +20   -0    demos/simpleplayer/player.h     
I  +0    -5    phonon/CMakeLists.txt     
I  +10   -10   phonon/backendcapabilities.cpp     
I  +10   -10   phonon/backendcapabilities.h     
I  +0    -4    phonon/experimental/CMakeLists.txt     
I  +1    -2    phonon/experimental/avcapture.cpp     
I  +2    -2    phonon/experimental/avcapture.h     
I  +1    -1    phonon/experimental/backendcapabilities.cpp     
I  +1    -1    phonon/experimental/backendcapabilities.h     
I  +2    -0    phonon/experimental/globalconfig.cpp     
I  +5    -1    phonon/experimental/globalconfig.h     
I  +20   -16   phonon/experimental/mediasource.cpp     
I  +9    -3    phonon/experimental/mediasource.h     
I  +4    -0    phonon/experimental/objectdescription.cpp     
I  +4    -0    phonon/experimental/objectdescription.h     
I  +0    -60   phonon/experimental/packet.cpp     
I  +0    -129  phonon/experimental/packet.h     
I  +0    -45   phonon/experimental/packet_p.h     
I  +0    -115  phonon/experimental/packetpool.cpp     
I  +0    -79   phonon/experimental/packetpool.h     
I  +0    -61   phonon/experimental/packetpool_p.h     
I  +0    -4    phonon/experimental/tests/CMakeLists.txt     
I  +0    -9    phonon/experimental/tests/avcaptureapptest/CMakeLists.txt     
I  +0    -146  phonon/experimental/tests/avcaptureapptest/capture_test.cpp     
I  +0    -72   phonon/experimental/tests/avcaptureapptest/capture_test.h     
I  +0    -35   phonon/experimental/tests/avcaptureapptest/capture_test_main.cpp     
I  +2    -2    phonon/experimental/tests/avcapturetest.cpp     
I  +0    -18   phonon/experimental/videocapturedevice/CMakeLists.txt     
I  +0    -13   phonon/experimental/videocapturedevice/videocapture/CMakeLists.txt     \
 I  +0    -118  phonon/experimental/videocapturedevice/videocapture/bayer.cpp     
I  +0    -30   phonon/experimental/videocapturedevice/videocapture/bayer.h     
I  +0    -196  phonon/experimental/videocapturedevice/videocapture/dummyvideodevice.cpp \
 I  +0    -70   phonon/experimental/videocapturedevice/videocapture/dummyvideodevice.h \
 I  +0    -180  phonon/experimental/videocapturedevice/videocapture/sonix_compress.cpp \
 I  +0    -8    phonon/experimental/videocapturedevice/videocapture/sonix_compress.h  \
 I  +0    -2947 phonon/experimental/videocapturedevice/videocapture/videodevice.cpp   \
 I  +0    -338  phonon/experimental/videocapturedevice/videocapture/videodevice.h     \
 I  +0    -64   phonon/experimental/videocapturedevice/videocapture/videodevicemodelpool.cpp \
 I  +0    -48   phonon/experimental/videocapturedevice/videocapture/videodevicemodelpool.h \
 I  +0    -901  phonon/experimental/videocapturedevice/videocapture/videodevicepool.cpp \
 I  +0    -135  phonon/experimental/videocapturedevice/videocapture/videodevicepool.h \
 I  +0    -62   phonon/experimental/videocapturedevice/videocapture/videodevicevector.cpp \
 I  +0    -63   phonon/experimental/videocapturedevice/videocapture/videodevicevector.h \
 I  +0    -168  phonon/experimental/videocapturedevice/videocapture/videoinput.cpp    \
 I  +0    -81   phonon/experimental/videocapturedevice/videocapture/videoinput.h     
I  +0    -17   phonon/experimental/videocapturedevice/videocapturetestapp/CMakeLists.txt \
 I  +0    -528  phonon/experimental/videocapturedevice/videocapturetestapp/mainwidget.ui \
 I  +0    -290  phonon/experimental/videocapturedevice/videocapturetestapp/mainwindow.cpp \
 I  +0    -86   phonon/experimental/videocapturedevice/videocapturetestapp/mainwindow.h \
 I  +0    -16   phonon/experimental/videocapturedevice/videocapturetestapp/videocapturetestapp.desktop \
 I  +0    -47   phonon/experimental/videocapturedevice/videocapturetestapp/videocapturetestappmain.cpp \
 I  +9    -11   phonon/globalconfig.cpp     
I  +4    -4    phonon/globalconfig.h     
I  +10   -10   phonon/mediasource.cpp     
I  +4    -4    phonon/mediasource.h     
I  +2    -2    phonon/mediasource_p.h     
I  +7    -7    phonon/objectdescription.h     
I  +0    -4    phonon/tests/CMakeLists.txt     
I  +0    -5    phonon/tests/captureapptest/CMakeLists.txt     
I  +0    -176  phonon/tests/captureapptest/capture_test.cpp     
I  +0    -74   phonon/tests/captureapptest/capture_test.h     
I  +0    -35   phonon/tests/captureapptest/capture_test_main.cpp     
I  +98   -0    phonon/tests/fakebackend/fake.desktop     

http://commits.kde.org/phonon/bcecdf48e50f5cf957df748e6cfeb684721665dc


[prev in list] [next in list] [prev in thread] [next in thread]