summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPrimal Pappachan2012-06-07 12:36:23 +0800
committerPrimal Pappachan2012-06-07 12:36:23 +0800
commiteccf6a5160c42d4c2583cb7866b9fc5d4c2f2c2f (patch)
tree3a391a080fc92081de056a5d1f5a3806b0717b6a
parent4eeb313ab165c0a83bc59f888cc7a58f98028f30 (diff)
downloadpycon_apac_2012-eccf6a5160c42d4c2583cb7866b9fc5d4c2f2c2f.tar.gz
pycon_apac_2012-eccf6a5160c42d4c2583cb7866b9fc5d4c2f2c2f.tar.bz2
pycon_apac_2012-eccf6a5160c42d4c2583cb7866b9fc5d4c2f2c2f.zip
removed unwanted text
-rw-r--r--fossee.tex17
1 files changed, 15 insertions, 2 deletions
diff --git a/fossee.tex b/fossee.tex
index 3d7a1b1..5a262cc 100644
--- a/fossee.tex
+++ b/fossee.tex
@@ -61,13 +61,15 @@
\tableofcontents
\end{frame}
-<<<<<<< HEAD
\section{FOSSEE}
\begin{frame}
\frametitle{FOSS for EE}
+\centering{
\includegraphics[scale=0.30]{foss_ee.png}
+}
\end{frame}
+\subsection{How}
\begin{frame}
\frametitle{How?}
\begin{itemize}
@@ -84,8 +86,9 @@
\includegraphics[scale=.30]{tree.png}
\end{frame}
+\subsection{What}
\begin{frame}
-\frametitle{WTF: What the FOSSEE}
+\frametitle{WtF: What the FOSSEE}
\begin{block}{FOSSEE}
is part of the National Mission on Education through ICT with the thrust area being \alert{Adaptation and deployment of open source simulation packages equivalent to proprietary software}, funded by MHRD.
\end{block}
@@ -97,6 +100,7 @@ is part of the National Mission on Education through ICT with the thrust area b
\end{block}
\end{frame}
+\subsection{Why}
\begin{frame}
\frametitle{Why}
\begin{columns}
@@ -149,6 +153,15 @@ In Python terms
\end{itemize}
\end{exampleblock}
\end{columns}
+\begin{block}<3->{Focus}
+\begin{itemize}
+\item Python
+\item NumPy
+\item SciPy
+\item Sage
+\end{itemize}
+\end{exampleblock}
+
\end{frame}