RT

To clone properly :

git clone --recursive https://github.com/<yourlogin>/RT
git remote add upstream https://github.com/roblabla42/RT

To merge changes from master inside your branch :

git pull upstream master
git merge master

Name	Name	Last commit message	Last commit date
Latest commit yderosie Merge pull request #28 from mbarbari/master Feb 15, 2016 7923c35 · Feb 15, 2016 History 96 Commits
ft_printf @ 44bb6a3	ft_printf @ 44bb6a3	Initial commit	Oct 27, 2015
include	include	ALL OK, insert parser, reflexion, color OK	Feb 15, 2016
libft @ 9295a6f	libft @ 9295a6f	Fix build, integrate mlx to show window	Dec 4, 2015
mlx_mac @ 6568215	mlx_mac @ 6568215	Initial commit	Oct 27, 2015
mlx_x11 @ 52bb6bf	mlx_x11 @ 52bb6bf	Fix build, integrate mlx to show window	Dec 4, 2015
script	script	Merge branch 'master' of github.com:roblabla42/RT	Dec 8, 2015
src	src	ALL OK, insert parser, reflexion, color OK	Feb 15, 2016
.gitignore	.gitignore	Initial commit	Oct 27, 2015
.gitmodules	.gitmodules	Fix build, integrate mlx to show window	Dec 4, 2015
.nfs.20051055.927e	.nfs.20051055.927e	Debut de reconstruction des frameworks, non fini. Petit test de notat…	Dec 8, 2015
.norminette_ignore	.norminette_ignore	Add norminette_ignore	Dec 4, 2015
Makefile	Makefile	ALL OK, insert parser, reflexion, color OK	Feb 15, 2016
README.md	README.md	Add more instructions	Oct 28, 2015
TODO	TODO	Debut de reconstruction des frameworks, non fini. Petit test de notat…	Dec 8, 2015
scene_test.json	scene_test.json	ALL OK, insert parser, reflexion, color OK	Feb 15, 2016

Provide feedback