Cambios

Se realizaron cambios en el menu y el cerrar sesion.
Merge remote-tracking branch 'origin/jorge.argds'
Merge remote-tracking branch 'origin/master' into jorge.argds
arreglando merge paula, jorge
Merge remote-tracking branch 'origin/master' into jorge.argds
commit ultimos cambios

Depuracion del menu y registro de accion
commit ultimos cambios

consultar historiales
Merge remote-tracking branch 'origin/marco-rodriguez'

Conflicts:
	BECA2/UI/App.config
	BECA2/UI/Frm_Carreras.vb
	BECA2/UI/Frm_Principal.Designer.vb
	BECA2/UI/Frm_Principal.resx
	BECA2/UI/UI.vbproj
	BECA2/UI/Uc_Carreras.Designer.vb
Merge remote-tracking branch 'origin/jorge.argds'

Conflicts:
	BECA2/UI/App.config
	BECA2/UI/Frm_Principal.Designer.vb
	BECA2/UI/Frm_Principal.vb
	BECA2/UI/UI.vbproj
	BECA2/UI/Uc_Carreras.Designer.vb
listo el merge
a

a
Merge remote-tracking branch 'origin/master' into esteban-lopez

Conflicts:
	BECA2/UI/App.config

merge

Merge remote-tracking branch 'origin/master' into
esteban-lopez

Conflicts:
	BECA2/UI/App.config
	BECA2/UI/My
Project/Application.myapp
	BECA2/UI/My
Project/Settings.Designer.vb
	BECA2/UI/My
Project/Settings.settings
	BECA2/UI/UI.vbproj

reporte

proforma

reporte

merge
Merge remote-tracking branch 'origin/master' into esteban-lopez

Conflicts:
	BECA2/BLL/GestorUsuario.cs
	BECA2/DAL/Utility/UtilidadesUsuario.cs
	BECA2/UI/App.config
	BECA2/UI/Frm_Principal.Designer.vb
	BECA2/UI/My Project/Application.myapp
	BECA2/UI/Uc_SeleccionarCarreras.vb
arreglando
listo
cambios Jorge

cambios Jorge
Commit 06/11/2014

Cambios generales y reporte de proforma
Documentación
integrado
Merge remote-tracking branch 'origin/marco-rodriguez'

Conflicts:
	BECA2/UI/App.config
	BECA2/UI/Frm_CrearCarrera.vb