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

merge

Browse Source
This commit is contained in:
Vítor Santos Costa 2012-02-01 20:59:43 +00:00
parent c4ee7ee0c3
commit 539f553133
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -36,8 +36,4 @@
url = git://yap.git.sourceforge.net/gitroot/yap/pldoc url = git://yap.git.sourceforge.net/gitroot/yap/pldoc
[submodule "packages/real"] [submodule "packages/real"]
path = 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 url = git://www.swi-prolog.org/home/pl/git/packages/real.git
>>>>>>> 7e73c781b06cb917d5a065ead5f872c28da619f1

2
configure vendored
View File

@ -1549,7 +1549,6 @@ ac_abs_builddir=$ac_pwd$ac_dir_suffix
# for backward compatibility: # for backward compatibility:
ac_top_builddir=$ac_top_build_prefix ac_top_builddir=$ac_top_build_prefix
<<<<<<< HEAD
if test ${have_dl} = yes if test ${have_dl} = yes
then then
LIBS="$LIBS -ldl" LIBS="$LIBS -ldl"
@ -1709,7 +1708,6 @@ generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc. Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it. gives unlimited permission to copy, distribute and modify it.
>>>>>>> 7e73c781b06cb917d5a065ead5f872c28da619f1
_ACEOF _ACEOF
exit exit
fi fi