From: Thomas Fillon <thomas@parisson.com>
Date: Tue, 29 Apr 2014 08:27:58 +0000 (+0200)
Subject: Merge branch 'server' of github.com:yomguy/TimeSide into server
X-Git-Tag: 0.5.5~1^2~37
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6db0f8cc2239c072f3b11e3ca2e26d66992b7f93;p=timeside.git

Merge branch 'server' of github.com:yomguy/TimeSide into server
---

6db0f8cc2239c072f3b11e3ca2e26d66992b7f93
diff --cc timeside/__init__.py
index 57eb89d,2bbc454..6c8135b
--- a/timeside/__init__.py
+++ b/timeside/__init__.py
@@@ -7,6 -7,5 +7,7 @@@ from . import analyze
  from . import grapher
  from . import encoder
  
+ 
  __version__ = '0.5.5'
 +
 +__all__ = ['api', 'core', 'decoder', 'analyzer', 'grapher', 'encoder']
diff --cc timeside/encoder/metadata.py
index 0000000,86abf87..d3f1b41
mode 000000,100644..100644
--- a/timeside/encoder/metadata.py
+++ b/timeside/encoder/metadata.py
@@@ -1,0 -1,25 +1,24 @@@
+ # -*- coding: utf-8 -*-
+ #
+ # Copyright (C) 2007-2009 Parisson
+ # Copyright (c) 2007 Olivier Guilyardi <olivier@samalyse.com>
+ # Copyright (c) 2007-2009 Guillaume Pellerin <pellerin@parisson.com>
+ #
+ # This file is part of TimeSide.
+ 
+ # TimeSide is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation, either version 2 of the License, or
+ # (at your option) any later version.
+ 
+ # TimeSide 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 General Public License for more details.
+ 
+ # You should have received a copy of the GNU General Public License
+ # along with TimeSide.  If not, see <http://www.gnu.org/licenses/>.
+ 
++
+ class Metadata(object):
+     pass
 -        
 -