Codigos Interface

ultima atualização 10/10/14 21:15
Project
Merge remote-tracking branch 'origin/master'

Conflicts:
	projeto/project/.metadata/.log

	projeto/project/.metadata/.plugins/org.eclipse.core.resources/.projects/AvaliadorTestesMutantes/.markers.snap

	projeto/project/.metadata/.plugins/org.eclipse.core.resources/.projects/AvaliadorTestesMutantes/.syncinfo.snap

	projeto/project/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.markers.snap

	projeto/project/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.syncinfo.snap

	projeto/project/.metadata/.plugins/org.eclipse.core.resources/.projects/Servers/.markers.snap

	projeto/project/.metadata/.plugins/org.eclipse.core.resources/.projects/Servers/.syncinfo.snap

	projeto/project/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap

	projeto/project/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	projeto/project/.metadata/.plugins/org.eclipse.core.resources/.snap

	projeto/project/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
Merge branch 'master' of https://github.com/fcaminada/mc437_grupo4