[pitivi/f16: 4/4] Merge branch 'f17' into f16
Jon Ciesla
limb at fedoraproject.org
Tue Mar 27 17:15:52 UTC 2012
commit 80c12df9334b9a08a5941b6b971f78379e41be3c
Merge: f957c91 5120804
Author: Jon Ciesla <limburgher at gmail.com>
Date: Tue Mar 27 12:15:39 2012 -0500
Merge branch 'f17' into f16
Conflicts:
pitivi.spec
pitivi-0.15.0-ignore-unknown-stream-types.patch | 29 +++++++++++++++++++++++
pitivi.spec | 11 ++++++++-
2 files changed, 39 insertions(+), 1 deletions(-)
---
More information about the scm-commits
mailing list