reupdate
update files cron
cambia completo III
update packaging
x64 build
fix updater
Merge branch 'master' of github.com:joseignaciosg/TiX

Conflicts:
	releases/TixApp.app/InstallerFiles/installStartupUDPClient.py
	releases/TixApp.app/InstallerFiles/installStartupUDPClientTest.py
	releases/TixApp.app/InstallerFiles/startupAppCaller.py
	releases/TixApp.app/InstallerFiles/toBeCopied/TixClientApp.py
	releases/TixApp.app/InstallerFiles/toBeCopied/com.user.loginscript.plist
	releases/TixApp.app/InstallerFiles/toBeCopied/startupAppCaller.sh
	releases/TixApp.app/InstallerFiles/toBeCopied/udpclienttiempos.cfg
	releases/TixApp.app/InstallerFiles/uninstallStartupUDPClient.py
	releases/TixApp.app/InstallerFiles/unistall_macos.sh
	releases/TixApp.app/TiX.desktop
	releases/TixApp.app/TixApp.py
	releases/TixApp.app/TixAppTest.py
	releases/TixApp.app/fixindent.py
	releases/TixApp.app/images/LogoTiX.png
	releases/TixApp.app/keygeneration.py
	releases/TixApp.app/kivy_install/data/fonts/DejaVuSans.ttf
	releases/TixApp.app/kivy_install/data/fonts/DroidSans-Bold.ttf
	releases/TixApp.app/kivy_install/data/fonts/DroidSans-BoldItalic.ttf
	releases/TixApp.app/kivy_install/data/fonts/DroidSans-Italic.ttf
	releases/TixApp.app/kivy_install/data/fonts/DroidSans.ttf
	releases/TixApp.app/kivy_install/data/fonts/DroidSansMono.ttf
	releases/TixApp.app/kivy_install/data/glsl/default.fs
	releases/TixApp.app/kivy_install/data/glsl/default.png
	releases/TixApp.app/kivy_install/data/glsl/default.vs
	releases/TixApp.app/kivy_install/data/glsl/header.fs
	releases/TixApp.app/kivy_install/data/glsl/header.vs
	releases/TixApp.app/kivy_install/data/images/background.jpg
	releases/TixApp.app/kivy_install/data/images/defaulttheme-0.png
	releases/TixApp.app/kivy_install/data/images/defaulttheme.atlas
	releases/TixApp.app/kivy_install/data/images/image-loading.gif
	releases/TixApp.app/kivy_install/data/images/testpattern.png
	releases/TixApp.app/kivy_install/data/keyboards/azerty.json
	releases/TixApp.app/kivy_install/data/keyboards/qwerty.json
	releases/TixApp.app/kivy_install/data/keyboards/qwertz.json
	releases/TixApp.app/kivy_install/data/logo/kivy-icon-128.png
	releases/TixApp.app/kivy_install/data/logo/kivy-icon-16.png
	releases/TixApp.app/kivy_install/data/logo/kivy-icon-24.png
	releases/TixApp.app/kivy_install/data/logo/kivy-icon-256.png
	releases/TixApp.app/kivy_install/data/logo/kivy-icon-32.png
	releases/TixApp.app/kivy_install/data/logo/kivy-icon-512.png
	releases/TixApp.app/kivy_install/data/logo/kivy-icon-64.png
	releases/TixApp.app/kivy_install/data/settings_kivy.json
	releases/TixApp.app/kivy_install/data/style.kv
	releases/TixApp.app/kivy_install/modules/__init__.py
	releases/TixApp.app/kivy_install/modules/_webdebugger.py
	releases/TixApp.app/kivy_install/modules/inspector.py
	releases/TixApp.app/kivy_install/modules/keybinding.py
	releases/TixApp.app/kivy_install/modules/monitor.py
	releases/TixApp.app/kivy_install/modules/recorder.py
	releases/TixApp.app/kivy_install/modules/screen.py
	releases/TixApp.app/kivy_install/modules/touchring.py
	releases/TixApp.app/kivy_install/modules/webdebugger.py
	releases/TixApp.app/tixapp.cfg
Merge branch 'master' of github.com:joseignaciosg/TiX

Conflicts:
	updater/tix_updater.sh