u
Merge remote-tracking branch 'Remote repolmen/master'

Conflicts:
	ExplorerII/src/a/b/form/processamento/ta/TableNode.java
.
Merge remote-tracking branch 'Remote repolmen/master'

Conflicts:
	ExplorerII/bin/a/b/jdbc/DSource.class
	ExplorerII/src/a/b/jdbc/DSource.java
	explorerFrontEnd/ExplorerFrontEnd/.classpath
	explorerFrontEnd/ExplorerFrontEnd/src/pt/lmen/beans/BeanPointer.java
finalização da tabela
Merge branch 'master' of https://github.com/lmen/repolmen

Conflicts:
	ExplorerII/.classpath
	explorerFrontEnd/ExplorerFrontEnd/.classpath
merge no novo pc
teste local
Merge remote-tracking branch 'origin/master'

Conflicts:
	explorerFrontEnd/ExplorerFrontEnd/WebContent/resources/lmenComp/table.xhtml
ultima versão página