[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 <tdfischer () fedoraproject ! org>
Date:       2011-02-17 2:00:31
Message-ID: 20110217020031.84059A60AE () git ! kde ! org
[Download RAW message or body]

Git commit ee745b3c2a67b3a86b255cf46e83858a4ef9bb3e by Trever Fischer.
Committed on 17/02/2011 at 02:58.
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  +3    -0    demos/captureapp/CMakeLists.txt     
I  +176  -0    demos/captureapp/captureapp.cpp     
I  +74   -0    demos/captureapp/captureapp.h     
I  +44   -0    demos/captureapp/captureapp_main.cpp     
I  +3    -0    demos/captureapp2/CMakeLists.txt     
I  +146  -0    demos/captureapp2/captureapp2.cpp     
I  +72   -0    demos/captureapp2/captureapp2.h     
I  +47   -0    demos/captureapp2/captureapp2_main.cpp     
I  +0    -5    phonon/CMakeLists.txt     
I  +6    -6    phonon/backendcapabilities.cpp     
I  +10   -10   phonon/backendcapabilities.h     
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    -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  +8    -8    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  +1    -1    phonon/tests/fakebackend/fake.desktop     

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



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