[vlmc-devel] commit: Abstract*Items: Merging code. ( Hugo Beauzée-Luyssen )

[git at videolan.org]

vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Sun Sep  5 20:31:18 2010 +0200| [aa5755f5df625372f2893bbcb900feae2eac5caf] | committer: Hugo Beauzée-Luyssen 

Abstract*Items: Merging code.

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=aa5755f5df625372f2893bbcb900feae2eac5caf
---

 src/Gui/timeline/AbstractGraphicsMediaItem.cpp |   65 ++++++++++++++++++++++
 src/Gui/timeline/AbstractGraphicsMediaItem.h   |   14 +++++-
 src/Gui/timeline/GraphicsAudioItem.cpp         |   58 --------------------
 src/Gui/timeline/GraphicsAudioItem.h           |   13 -----
 src/Gui/timeline/GraphicsMovieItem.cpp         |   68 ------------------------
 src/Gui/timeline/GraphicsMovieItem.h           |   14 -----
 src/Gui/timeline/GraphicsTrack.cpp             |    3 +-
 7 files changed, 79 insertions(+), 156 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commitdiff;h=aa5755f5df625372f2893bbcb900feae2eac5caf