Commit Graph

1 Commits

Author SHA1 Message Date
vscosta
11e81b457d Merge branch 'master' of https://github.com/vscosta/yap-6.3
# Conflicts:
#	packages/python/swig/CMakeLists.txt
#	packages/python/swig/setup.py.in
#	swi/library/CMakeLists.txt
2017-09-03 00:07:10 +01:00