cheveguerra/Android_durakelo
1
0
Fork 0
mirror of https://github.com/KeymonSoft/Android_durakelo.git synced 2026-04-17 19:37:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/KeymonSoft/Android_durakelo

Browse Source 
# Conflicts:
#	durakelo.b4a.meta
This commit is contained in:
Jose Alberto Guerra Ugalde
2023-11-22 10:41:29 -06:00
parent 09aee86ea4 520c0bc31b
commit 3f6fd5e948
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
durakelo.b4a.meta
View File

@@ -72,7 +72,22 @@ ModuleClosedNodes5=2,3,6,7,8,9
ModuleClosedNodes6=
ModuleClosedNodes7=
ModuleClosedNodes8=
ModuleClosedNodes21=
ModuleClosedNodes22=
ModuleClosedNodes23=
ModuleClosedNodes24=
ModuleClosedNodes3=
ModuleClosedNodes4=
ModuleClosedNodes5=2,3,6,7,8,9
ModuleClosedNodes6=
ModuleClosedNodes7=
ModuleClosedNodes8=
<<<<<<< .mine
ModuleClosedNodes9=2,5,6,8,10,11,12,13,24,36,37
NavigationStack=Starter,ENVIA_ULTIMA_GPS,98,0,fila,B_IMP_Click,699,0,colonia2,HACER_PEDIDO,455,0,seleccion,Globals,164,0,seleccion,IsConnectedToInternet,266,0,seleccion,Activity_Create,184,6,Visual Designer,seleccion.bal,-100,4,Visual Designer,mapa_rutas.bal,-100,3,MAPA_RUTAS,Process_Globals,15,0,MAPA_RUTAS,Globals,16,0,MAPA_RUTAS,Activity_Create,98,6
=======
ModuleClosedNodes9=2,5,6,8,10,11,12,13,22,24,36,37
NavigationStack=seleccion,connecta_Click,2009,0,MAPA_RUTAS,MapFragment1_Ready,135,0,DBRequestManager,Initialize,20,0,DBRequestManager,PrintTable,267,0,DBRequestManager,Class_Globals,12,0,seleccion,Subir_Click,862,0,seleccion,JobDone,1105,6,seleccion,cargar_Click,900,5,Diseñador Visual,login.bal,-100,3,Main,Process_Globals,29,0
>>>>>>> .theirs
SelectedBuild=0
VisibleModules=21,20,24,14