jmj
Merge branch 'master' of https://github.com/jhossmar/simulacion.git
Merge branch 'master' of https://github.com/jhossmar/simulacion.git
funcionalidada a los botones del Panel de procesos
Merge branch 'master' of https://github.com/jhossmar/simulacion.git

Conflicts:
	src/com/umss/fcyt/simulaciongraficos/PanelDeProcesos.java
	src/com/umss/fcyt/simulaciongraficos/VentanaPrincipal.java
visor PDF
Interfaz para manual de Usuario
Merge branch 'master' of https://github.com/jhossmar/simulacion.git

Conflicts:
	.classpath
interfaz manual de usuario
borrar
Revert "borrar"

This reverts commit 350067d8daaafc009443257a53247144c4ebe995.
Revert "Revert "borrar""

This reverts commit b9a39c0ba1e0bf5561a1484a3e815d24402b4e42.
Revert "Revert "Revert "borrar"""

This reverts commit ff72f5270c86f2724622dd39d509c3755b4e1662.
modificando el .classpath