Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3

Conflicts:
	packages/YapR
This commit is contained in:
Joao 2011-04-15 15:23:10 +01:00
commit 2bef030634
2 changed files with 2 additions and 1 deletions

View File

@ -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

@ -0,0 +1 @@
Subproject commit a6646d0be1d1d63782e0c1395dd449183fdd8988