Merge remote-tracking branch 'origin/0.10'

This commit is contained in:
Sebastian Dröge 2012-03-29 15:10:09 +02:00
commit fa44d050f5
2 changed files with 38 additions and 0 deletions

View file

@ -1,3 +1,22 @@
/* GStreamer Editing Services Pitivi Formatter
* Copyright (C) 2011-2012 Mathieu Duponchelle <seeed@laposte.net>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include <libxml/xmlreader.h>
#include <libxml/tree.h>
#include <libxml/parser.h>

View file

@ -1,3 +1,22 @@
/* GStreamer Editing Services Pitivi Formatter
* Copyright (C) 2011-2012 Mathieu Duponchelle <seeed@laposte.net>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef _GES_PITIVI_FORMATTER
#define _GES_PITIVI_FORMATTER