]> gerrit.simantics Code Review - simantics/python.git/commit
Merge branch 'change/300/2' 16/316/1
authorReino Ruusu <reino.ruusu@vtt.fi>
Wed, 1 Feb 2017 15:32:43 +0000 (17:32 +0200)
committerReino Ruusu <reino.ruusu@vtt.fi>
Wed, 1 Feb 2017 15:32:43 +0000 (17:32 +0200)
commitac16ebed6a3e0932f774ca3ee5963ed776ef6c08
tree4502a33b530fd93fbc8c7d7ee1404794e7a5e53f
parent9eb8ba534764cce77e293d1f39ddf0d76ae7eaf7
parent025afe064401dba02dd70cf3daa1b94d52966aa8
Merge branch 'change/300/2'

Conflicts:
org.simantics.pythonlink.win32.x86_64/jnipython.dll
org.simantics.pythonlink.win32.x86_64/src/sclpy.c
org.simantics.pythonlink/src/org/simantics/pythonlink/PythonContext.java

Change-Id: I4a07bce4c1f4a0134ad774161ff79821f0d7e018
org.simantics.pythonlink.win32.x86_64/.cproject
org.simantics.pythonlink.win32.x86_64/jnipython.dll
org.simantics.pythonlink.win32.x86_64/src/sclpy.c
org.simantics.pythonlink/src/org/simantics/pythonlink/PythonContext.java