release 1.4.12

hugoruscitti · Nov 23, 2017 · ca3484e · ca3484e
1 parent 1503735
commit ca3484e
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 N=[0m
 V=[01;32m
 
-VERSION=1.4.11
+VERSION=1.4.12
 VPS_HOST=162.243.50.192
 
 all:

diff --git a/data/asistente/js/version.js b/data/asistente/js/version.js
@@ -1,7 +1,7 @@
 
 window.DESCRIPCION_VERSION = {
-  version: '1.4.11',
-  fecha: '14 de Jun del 2017',
-  commit: '8c1bb38',
-  changelog: ['Merge branch "develop"', 'actualizando manual.', 'Implementando el método luego_de_actualizar en los actores.', 'actualizando manual.', 'Merge branch "develop" of github.com:hugoruscitti/pilas into develop', ]
+  version: '1.4.12',
+  fecha: '23 de Nov del 2017',
+  commit: '1503735d',
+  changelog: ['Merge branch "develop"', 'Agregando función para obtener todos los actores de la escena closes #303', 'Merge branch "master" into develop', 'Agregando instrucciones para instalar pyqt4.', 'Resolviendo conflicto de versiones.', ]
 }
diff --git a/extras/actualizar_version.py b/extras/actualizar_version.py
@@ -28,7 +28,7 @@
 changelist = item
 
 template = template.\
-  replace('VERSION_STR', '1.4.11').\
+  replace('VERSION_STR', '1.4.12').\
   replace('FECHA', hoy.strftime('%d de %b del %Y')).\
   replace('CHANGELOG_LIST', changelist).\
   replace('COMMIT', str(commit))

diff --git a/extras/instalador.nsi b/extras/instalador.nsi
@@ -13,7 +13,7 @@
 
   ;Name and file
   Name "pilas-engine"
-  OutFile "pilas-engine_1.4.11.exe"
+  OutFile "pilas-engine_1.4.12.exe"
 
   ;Default installation folder
   InstallDir "c:\pilas-engine"

diff --git a/pilasengine/__init__.py b/pilasengine/__init__.py
@@ -43,7 +43,7 @@
 
 import widget
 
-VERSION = "1.4.11"
+VERSION = "1.4.12"
 
 
 def handler(signum, frame):

diff --git a/setup-mac.py b/setup-mac.py
@@ -2,7 +2,7 @@
 
 setup(
     name='pilas-engine',
-    version="1.4.11",
+    version="1.4.12",
     app=["bin/pilasengine"],
     data_files = [
         ('bin/pilasengine', ['bin/pilasengine']),

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 setup(
         name='pilas',
         zip_safe=False,
-        version="1.4.11",
+        version="1.4.12",
         description="""Pilas Engine - un motor para realizar videojuegos de manera rápida y sencilla.
 
 Es una herramienta orientada a programadores casuales