]> gerrit.simantics Code Review - simantics/python.git/commitdiff
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)
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


No differences found