primeiro commit
COMMIT  JIFConexao.java

Signed-off-by: companysoftware <leoln26@gmail.com>
senha do JIFConexao.java
Signed-off-by: companysoftware <leoln26@gmail.com>
Merge branch 'master' of github.com:companysoftware/report

Conflicts:
	build/classes/pronewextintor/JIFConexao.class
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/private/private.properties
	src/pronewextintor/JIFConexao.java
num sei o q
Merge github.com:companysoftware/report

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties
Merge github.com:companysoftware/report

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties
Merge branch 'master' of github.com:companysoftware/report
frente caixa
frente caixa
Signed-off-by: companysoftware <leoln26@gmaill.com>
Merge branch 'first' of github.com:companysoftware/report

Conflicts:
	.gitignore
	DarumaFrameWork.xml
	ECF/030901EMULADOR       13042012_1.txt
	ECF/030901EMULADOR       14042012_1.txt
	ECF/030901EMULADOR       16032012.txt
	ECF/030901EMULADOR       17042012_1.txt
	ECF/030901EMULADOR10022012.txt
	ECF/ArqMD5.txt
	ECF/ArqMD5_1.txt
	ECF/BemaMFD2.log
	ECF/DAVsEmitidos.txt
	ECF/DAVsEmitidos_1.txt
	ECF/EMULADOR            _06032012_06032012.TXT
	ECF/Estoque.txt
	ECF/Tab. Prod.txt
	ECF/Tab.Prod.txt
	ECF/VendasPeriodo 20120210.txt
	ECF/VendasPeriodo 20120401_1.txt
	build.xml
	configBD.properties
	configBD_STAND_ALONE.properties
	lib/nblibraries.properties
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	private_asn1.key
	private_raw.txt
	public_asn1.key
	public_raw.txt
	relatorio/RelatorioCaixa.jasper
	relatorio/ReportOrcamento.jasper
	relatorio/ReportOrcamento.jrxml
	relatorio/ReportPedidoNew.jasper
	src/build.xml
	src/pronewextintor/Cliente/JIFRelClientes.form
	src/pronewextintor/Cliente/JIFRelClientes.java
	src/pronewextintor/Cliente/resources/JIFRelClientes.properties
	src/pronewextintor/Consignacao/JIFConsignar.java
	src/pronewextintor/Consignacao/JIFDevolucao.form
	src/pronewextintor/Consignacao/JIFDevolucao.java
	src/pronewextintor/Consignacao/JIFRelConsignacao.java
	src/pronewextintor/DAO/ConfiguracaoSistema.java
	src/pronewextintor/DAO/Controle_ECF_Emitidos.java
	src/pronewextintor/Ecf/BemaECF.java
	src/pronewextintor/Ecf/JIF_Ecf_RelatoriosFiscais.form
	src/pronewextintor/Ecf/JIF_Ecf_RelatoriosFiscais.java
	src/pronewextintor/Ecf/Paf/DAVsEmitidos.java
	src/pronewextintor/Ecf/Paf/GeraHash.java
	src/pronewextintor/Ecf/Paf/GeraMD5PAFECF.java
	src/pronewextintor/Ecf/Paf/Verificando_R_Z_P.java
	src/pronewextintor/Ecf/ReadTxt.java
	src/pronewextintor/Ecf/UtilitarioDaruma.java
	src/pronewextintor/Financeiro/JIFEntradaRecursos.form
	src/pronewextintor/Financeiro/JIFEntradaRecursos.java
	src/pronewextintor/Financeiro/Quitar/JIFQuitarContasReceber.form
	src/pronewextintor/Financeiro/Quitar/JIFQuitarContasReceber.java
	src/pronewextintor/Financeiro/Quitar/resources/JIFQuitarContasReceber.properties
	src/pronewextintor/JIFConexao.form
	src/pronewextintor/JIFConexao.java
	src/pronewextintor/JIFLiberacao.java
	src/pronewextintor/LiberacaoAcesso.java
	src/pronewextintor/Mesa/JIFConfMesas.form
	src/pronewextintor/Mesa/JIFConfMesas.java
	src/pronewextintor/OrdemServico/JIFBaixaOS.form
	src/pronewextintor/OrdemServico/JIFBaixaOS.java
	src/pronewextintor/OrdemServico/JIFRelOS.form
	src/pronewextintor/OrdemServico/JIFRelOS.java
	src/pronewextintor/OrdemServico/JIF_DavOs.form
	src/pronewextintor/OrdemServico/JIF_DavOs.java
	src/pronewextintor/OrdemServico/JIF_NewEnsaio.form
	src/pronewextintor/OrdemServico/JIF_NewEnsaio.java
	src/pronewextintor/OrdemServico/resources/JIFRelOS.properties
	src/pronewextintor/ProNewExtintorApp.java
	src/pronewextintor/ProNewExtintorView.form
	src/pronewextintor/ProNewExtintorView.java
	src/pronewextintor/Produto/JIFRelProdutos.form
	src/pronewextintor/Produto/JIFRelProdutos.java
	src/pronewextintor/User/JIFUser.form
	src/pronewextintor/User/JIFUser.java
	src/pronewextintor/Venda/Grade/JIF_Venda_Grade.java
	src/pronewextintor/Venda/JIFConcluirVenda.form
	src/pronewextintor/Venda/JIFConcluirVenda.java
	src/pronewextintor/Venda/JIFRelVendas.form
	src/pronewextintor/Venda/JIFRelVendas.java
	src/pronewextintor/Venda/PreVenda/JIFVenda.form
	src/pronewextintor/Venda/PreVenda/JIFVenda.java
	src/pronewextintor/Venda/PreVenda/resources/JIFVenda.properties
	src/pronewextintor/persist/GenericDAO.java
	src/pronewextintor/resources/JIFConexao.properties
	src/pronewextintor/resources/ProNewExtintorApp.properties
	src/pronewextintor/resources/ProNewExtintorView.properties
analisando testte
dhyan
dhyan
Merge branch 'first' of github.com:companysoftware/report

Conflicts:
	private_asn1.key
	private_raw.txt
	public_asn1.key
	public_raw.txt
	src/pronewextintor/ProNewExtintorApp.java
	src/pronewextintor/ProNewExtintorView.java