Merge remote-tracking branch 'origin/branching'

bf182669 · Jeroen F.J. Laros · 24ae7381 · 5cc09f6f · bf182669 · bf182669
Commit bf182669 authored Oct 14, 2013 by Jeroen F.J. Laros
38 changed files
--- a/README.md
+++ b/README.md
-# Git Introduction Course
+# Git introduction course

 This course aims at everyone who works in the Bioinformatics field. We cover a
-*version control system* named **git**. This system is widely used by software
+*version control system* named *Git*. This system is widely used by software
 developers, but can also be used for project management. By keeping track of
 all versions, history, etc. collaboration with colleagues is easy and your
 analysis will be reproducible.

-The presentations are made in LaTeX, for the template and stylesheet, go
+The presentations are made in *LaTeX*, for the template and stylesheet, go
 [here](https://humgenprojects.lumc.nl/svn/presentation/trunk/).
--- a/branching/Makefile
+++ b/branching/Makefile
+/local/projects/presentation/trunk/Makefile
\ No newline at end of file
--- a/branching/beamerthemelumc.sty
+++ b/branching/beamerthemelumc.sty
+/local/projects/presentation/trunk/beamerthemelumc.sty
\ No newline at end of file
--- a/branching/branching.tex
+++ b/branching/branching.tex
--- a/branching/gen2phen_logo.eps
+++ b/branching/gen2phen_logo.eps
+/local/projects/presentation/trunk/gen2phen_logo.eps
\ No newline at end of file
--- a/branching/images/branches.eps
+++ b/branching/images/branches.eps
--- a/branching/images/branches.png
+++ b/branching/images/branches.png
--- a/branching/images/commit.eps
+++ b/branching/images/commit.eps
--- a/branching/images/commit.png
+++ b/branching/images/commit.png
--- a/branching/images/example-branched.eps
+++ b/branching/images/example-branched.eps
--- a/branching/images/example-branched.png
+++ b/branching/images/example-branched.png
--- a/branching/images/example-committed.eps
+++ b/branching/images/example-committed.eps
--- a/branching/images/example-committed.png
+++ b/branching/images/example-committed.png
--- a/branching/images/example-merged-ff.eps
+++ b/branching/images/example-merged-ff.eps
--- a/branching/images/example-merged-ff.png
+++ b/branching/images/example-merged-ff.png
--- a/branching/images/example-merged.eps
+++ b/branching/images/example-merged.eps
--- a/branching/images/example-merged.png
+++ b/branching/images/example-merged.png
--- a/branching/images/example.eps
+++ b/branching/images/example.eps
--- a/branching/images/example.png
+++ b/branching/images/example.png
--- a/branching/images/head.eps
+++ b/branching/images/head.eps
--- a/branching/images/head.png
+++ b/branching/images/head.png
--- a/branching/images/linear.eps
+++ b/branching/images/linear.eps
--- a/branching/images/linear.png
+++ b/branching/images/linear.png
--- a/branching/images/master.eps
+++ b/branching/images/master.eps
--- a/branching/images/master.png
+++ b/branching/images/master.png
--- a/branching/images/meld.eps
+++ b/branching/images/meld.eps
--- a/branching/images/meld.png
+++ b/branching/images/meld.png
--- a/branching/images/merge.eps
+++ b/branching/images/merge.eps
--- a/branching/images/merge.png
+++ b/branching/images/merge.png
--- a/branching/images/nonlinear.eps
+++ b/branching/images/nonlinear.eps
--- a/branching/images/nonlinear.png
+++ b/branching/images/nonlinear.png
--- a/branching/lgtc_logo.eps
+++ b/branching/lgtc_logo.eps
+/local/projects/presentation/trunk/lgtc_logo.eps
\ No newline at end of file
--- a/branching/lumc_logo.eps
+++ b/branching/lumc_logo.eps
+/local/projects/presentation/trunk/lumc_logo.eps
\ No newline at end of file
--- a/branching/lumc_logo_small.eps
+++ b/branching/lumc_logo_small.eps
+/local/projects/presentation/trunk/lumc_logo_small.eps
\ No newline at end of file
--- a/branching/nbic_logo.eps
+++ b/branching/nbic_logo.eps
+/local/projects/presentation/trunk/nbic_logo.eps
\ No newline at end of file
--- a/branching/ngi_logo.eps
+++ b/branching/ngi_logo.eps
+/local/projects/presentation/trunk/ngi_logo.eps
\ No newline at end of file
--- a/branching/nwo_logo_en.eps
+++ b/branching/nwo_logo_en.eps
+/local/projects/presentation/trunk/nwo_logo_en.eps
\ No newline at end of file
--- a/branching/ul_logo.eps
+++ b/branching/ul_logo.eps
+/local/projects/presentation/trunk/ul_logo.eps
\ No newline at end of file