Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3
Conflicts: packages/YapR
This commit is contained in:
commit
2bef030634
2
H/Yap.h
2
H/Yap.h
@ -60,7 +60,7 @@
|
|||||||
#endif
|
#endif
|
||||||
#endif /* YAPOR */
|
#endif /* YAPOR */
|
||||||
|
|
||||||
#if defined(YAPOR) || defined(THREADS) || defined(TABLING)
|
#if defined(YAPOR) || defined(THREADS)
|
||||||
#define MULTIPLE_STACKS 1
|
#define MULTIPLE_STACKS 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
1
packages/YapR
Submodule
1
packages/YapR
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit a6646d0be1d1d63782e0c1395dd449183fdd8988
|
Reference in New Issue
Block a user