diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.dcc.fc.up.pt/yap-6.3

Browse Source 
Conflicts:
	.gitmodules
	configure
	packages/real
This commit is contained in:
Vítor Santos Costa
2012-02-01 20:57:42 +00:00
parent ad9e1d8ea4 7e73c781b0
commit c4ee7ee0c3
12 changed files with 4499 additions and 14486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.gitmodules vendored
View File

@@ -31,12 +31,13 @@
[submodule "packages/R"]
path = packages/R
url = git://yap.git.sourceforge.net/gitroot/yap/R
[submodule "packages/YapR"]
path = packages/YapR
url = git://yap.git.sourceforge.net/gitroot/yap/YapR
[submodule "packages/pldoc"]
path = packages/pldoc
url = git://yap.git.sourceforge.net/gitroot/yap/pldoc
[submodule "packages/real"]
path = packages/real
<<<<<<< HEAD
url = vsc@www.swi-prolog.org:/home/pl/git/packages/real.git
=======
url = git://www.swi-prolog.org/home/pl/git/packages/real.git
>>>>>>> 7e73c781b06cb917d5a065ead5f872c28da619f1