Skip to content
Find file Blame History Permalink
  • Sebastian Gaida's avatar
    Merge branch 'master' of https://gitlab.uni-koblenz.de/gaida/ba_gaida · 84e639dc
    Sebastian Gaida authored 
    # Conflicts:
#	ba_gaida/src/shaders/ba_gaida/normalShader.glsl
#	doku/Quellen/2014_EG_SPH_STAR.pdf
#	doku/cgBA_Latex/BA.aux
#	doku/cgBA_Latex/BA.bbl
#	doku/cgBA_Latex/BA.lof
#	doku/cgBA_Latex/BA.log
#	doku/cgBA_Latex/BA.out
#	doku/cgBA_Latex/BA.pdf
#	doku/cgBA_Latex/BA.synctex.gz
#	doku/cgBA_Latex/BA.tex
#	doku/cgBA_Latex/BA.toc
#	doku/cgBA_Latex/Bilder/StoringLable.JPG
#	doku/cgBA_Latex/lib.bib
    84e639dc