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

pls report
Merge remote-tracking branch 'origin/jorge.argds' into jorge.argds

Conflicts:
	BECA2/UI/My Project/Application.Designer.vb
	BECA2/UI/My Project/Application.myapp
Merge remote-tracking branch 'origin/jorge.argds'

Conflicts:
	BECA2/UI/My Project/Application.myapp
lel

lel
Merge remote-tracking branch 'origin/jorge.argds'

Conflicts:
	BECA2/UI/App.config
	BECA2/UI/UI.vbproj
manifest
Arreglado el master
Merge remote-tracking branch 'origin/master' into esteban-lopez
Registrar accion

Se incluye la funcionalidad de registrar accion, aun sin utilizar
Merge remote-tracking branch 'origin/paula'

Conflicts:
	BECA2/UI/My Project/Resources.Designer.vb
	BECA2/UI/UI.vbproj
Merge
Merge remote-tracking branch 'origin/master' into esteban-lopez
Commit 02-11-2014

Minima modificación
aqui vamos

espero que sirva
Beca
Marco

Conflicts:
	BECA2/BLL/BLL.csproj
	BECA2/UI/My Project/Application.myapp
	BECA2/UI/My Project/Settings.Designer.vb
	BECA2/UI/UI.vbproj