merged with master

2019-03-25 12:43:23 +11:00
parent e2c5c87a0a a3c1342f77
commit 93c009c7fd
83 changed files with 7823 additions and 1469 deletions
@@ -87,6 +87,8 @@ private:
  int type;
  VoidPtr object;

+  QString GetStringDuration();
+
  // item functions
  QList<MediaPtr> children;
  Media* parent;