]> gerrit.simantics Code Review - simantics/python.git/commit
Fixed merge errors. 17/317/1
authorReino Ruusu <reino.ruusu@vtt.fi>
Wed, 1 Feb 2017 16:02:35 +0000 (18:02 +0200)
committerReino Ruusu <reino.ruusu@vtt.fi>
Wed, 1 Feb 2017 16:02:35 +0000 (18:02 +0200)
commit99a7e38e79e1f1bd4a01f37eaa9ea08ae7a9d433
treefa07e678e3dc356f68f49046c121fc8ca3723b67
parentac16ebed6a3e0932f774ca3ee5963ed776ef6c08
Fixed merge errors.

Change-Id: Ia2c8157c0f81c7b77033a5a2477a4671fcb3ac3f
org.simantics.pythonlink.win32.x86_64/jnipython.dll
org.simantics.pythonlink.win32.x86_64/src/sclpy.c