From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 11 Oct 2013 09:24:12 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/telemeta-doc
X-Git-Tag: CMMR2013-slides~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=169d44bb12f1458591b5619db8849a14f6759e57;p=telemeta-doc.git

Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/telemeta-doc

Conflicts:
	CMMR_2013/poster/poster_cmmr2013.tex
---

169d44bb12f1458591b5619db8849a14f6759e57
diff --cc CMMR_2013/poster/poster_cmmr2013.tex
index 5680208,5fb0a2c..fbcc206
--- a/CMMR_2013/poster/poster_cmmr2013.tex
+++ b/CMMR_2013/poster/poster_cmmr2013.tex
@@@ -211,15 -214,9 +214,10 @@@ It should be noted that annotations an
  \begin{column}[T]{.49\linewidth}
    \begin{block}{TimeSide : open web audio processing framework}
  One specificity of the Telemeta architecture is to rely on an external component, \emph{TimeSide}, that offers audio player integration together with low and high level audio signal processing capabilities.
-  \fcolorbox{telemetaRed}{yellow!40}{%
-    \begin{minipage}{0.8\linewidth}\small
-      \vskip1ex
-      \begin{itemize}\bf
-      \item \url{https://github.com/yomguy/TimeSide/}
-      \end{itemize}
-      \vskip1ex
-    \end{minipage}
- }
++
+ \begin{center}
 -  \colorbox{yellow!50}{\bf \hskip3ex \url{http://www.timeside.org} \hskip3ex  }
++  \colorbox{yellow!50}{\bf \hskip3ex \url{https://github.com/yomguy/TimeSide/} \hskip3ex  }
+ \end{center}
  
      \begin{figure}[htbp]
    \centering