Commit Graph

4 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
Vitor Santos Costa
9272a1c7d5 python 2017-06-22 10:41:41 +01:00
Vitor Santos Costa
2ad3420fac fixes 2017-06-05 13:06:12 +01:00
Vitor Santos Costa
6a2d74ac6e Merge branch 'master' of xato:0517 2017-05-19 10:03:49 +01:00