Changeset 561 for trunk/src/3rdparty/phonon/gstreamer/streamreader.cpp
- Timestamp:
- Feb 11, 2010, 11:19:06 PM (16 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
src/3rdparty/phonon/gstreamer/streamreader.cpp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/vendor/nokia/qt/4.6.1 merged eligible /branches/vendor/nokia/qt/current merged eligible /branches/vendor/trolltech/qt/current 3-149
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/src/3rdparty/phonon/gstreamer/streamreader.cpp
r2 r561 21 21 22 22 QT_BEGIN_NAMESPACE 23 23 #ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM 24 24 namespace Phonon 25 25 { … … 50 50 } 51 51 } 52 #endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM 52 53 53 54 QT_END_NAMESPACE
Note:
See TracChangeset
for help on using the changeset viewer.
