diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-10-22 23:20:14 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-10-22 23:20:14 +0000 |
| commit | b0bdc9e3950e7e1e4cd0b1e6601da7744ecccf08 (patch) | |
| tree | a0ef43a85df03df285cd86aa66c5c4b2477af0cc /editors/openoffice-1.1-devel/files/patch-bridges+prj+build.lst | |
| parent | 643_OO did not get tagged for the ${cc} -> ${CC} change. (diff) | |
Add merged patches which conflicted.
Notes
Notes:
svn path=/head/; revision=68622
Diffstat (limited to 'editors/openoffice-1.1-devel/files/patch-bridges+prj+build.lst')
| -rw-r--r-- | editors/openoffice-1.1-devel/files/patch-bridges+prj+build.lst | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/editors/openoffice-1.1-devel/files/patch-bridges+prj+build.lst b/editors/openoffice-1.1-devel/files/patch-bridges+prj+build.lst index cd979b062a34..fee3d847c5e6 100644 --- a/editors/openoffice-1.1-devel/files/patch-bridges+prj+build.lst +++ b/editors/openoffice-1.1-devel/files/patch-bridges+prj+build.lst @@ -1,11 +1,11 @@ ---- ../bridges/prj/build.lst.orig Tue Mar 19 22:06:50 2002 -+++ ../bridges/prj/build.lst Tue Jun 4 12:24:46 2002 -@@ -9,6 +9,8 @@ - br bridges\source\cpp_uno\gcc2_linux_intel nmake - u br_gccli br_unotypes NULL - br bridges\source\cpp_uno\gcc3_linux_intel nmake - u br_gcc3li br_unotypes NULL - br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL +--- ../bridges/prj/build.lst.orig Tue Oct 30 17:28:35 2001 ++++ ../bridges/prj/build.lst Fri Oct 18 22:13:04 2002 +@@ -13,5 +13,8 @@ + br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes NULL + br bridges\source\cpp_uno\cc50_solaris_intel nmake - u br_cc50soli br_unotypes NULL + br bridges\source\cpp_uno\gcc2_solaris_sparc nmake - u br_gccsols br_unotypes NULL ++br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL +br bridges\source\cpp_uno\gcc2_freebsd_intel-sjlj nmake - u br_gccfi br_unotypes NULL +br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u br_gcc3fi br_unotypes NULL - br bridges\source\cpp_uno\gcc2_linux_powerpc nmake - u br_gcclp br_unotypes NULL - br bridges\source\cpp_uno\gcc2_macosx_powerpc nmake - u br_gccmacoxp br_unotypes NULL - br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes NULL + br bridges\source\prot_uno nmake - all br_pruno br_unotypes NULL + br bridges\source\java_uno nmake - all br_java_uno br_rcon NULL |