Meu primeiro commit.
14 - 10 -14
14 - 10 -14
2
2
2
2
Merge origin/master
2
nov

comite 10-11
Merge branch 'master' of https://github.com/lulucostapinto/TCC

Conflicts:
	.gitignore
	TccLulu-ejb/build.xml
	TccLulu-ejb/nbproject/build-impl.xml
	TccLulu-ejb/nbproject/genfiles.properties
	TccLulu-ejb/nbproject/private/private.properties
	TccLulu-ejb/nbproject/project.properties
	TccLulu-ejb/nbproject/project.xml
	TccLulu-ejb/src/java/br/sgci/bean/Agenda.java
	TccLulu-ejb/src/java/br/sgci/bean/Biblioteca.java
	TccLulu-ejb/src/java/br/sgci/bean/Curriculo.java
	TccLulu-ejb/src/java/br/sgci/bean/Curso.java
	TccLulu-ejb/src/java/br/sgci/bean/Usuario.java
	TccLulu-ejb/src/java/br/sgci/dao/AgendaDAO.java
	TccLulu-ejb/src/java/br/sgci/dao/AgendaDAORemote.java
	TccLulu-ejb/src/java/br/sgci/dao/BibliotecaDAO.java
	TccLulu-ejb/src/java/br/sgci/dao/BibliotecaDAORemote.java
	TccLulu-ejb/src/java/br/sgci/dao/CurriculoDAO.java
	TccLulu-ejb/src/java/br/sgci/dao/CurriculoDAORemote.java
	TccLulu-ejb/src/java/br/sgci/dao/CursoDAO.java
	TccLulu-ejb/src/java/br/sgci/dao/CursoDAORemote.java
	TccLulu-ejb/src/java/br/sgci/dao/UsuarioDAO.java
	TccLulu-ejb/src/java/br/sgci/dao/UsuarioDAORemote.java
	TccLulu-war/build.xml
	TccLulu-war/nbproject/build-impl.xml
	TccLulu-war/nbproject/faces-config.NavData
	TccLulu-war/nbproject/genfiles.properties
	TccLulu-war/nbproject/private/private.properties
	TccLulu-war/nbproject/project.properties
	TccLulu-war/nbproject/project.xml
	TccLulu-war/src/conf/MANIFEST.MF
	TccLulu-war/src/java/br/sgci/mng/AgendaMNG.java
	TccLulu-war/src/java/br/sgci/mng/BibliotecaMNG.java
	TccLulu-war/src/java/br/sgci/mng/CurriculoMNG.java
	TccLulu-war/src/java/br/sgci/mng/CursoMNG.java
	TccLulu-war/src/java/br/sgci/mng/UsuarioMNG.java
	TccLulu-war/web/agenda.xhtml
	TccLulu-war/web/andamento.xhtml
	TccLulu-war/web/biblioteca.xhtml
	TccLulu-war/web/curso.xhtml
	TccLulu-war/web/encerrados.xhtml
	TccLulu-war/web/index.xhtml
	TccLulu-war/web/padrao.xhtml
	TccLulu-war/web/paginainicial.xhtml
	TccLulu-war/web/solicitacao.xhtml
	TccLulu-war/web/usuario.xhtml
	build.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/private/private.properties
	nbproject/project.properties
	nbproject/project.xml