[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] trunk r3730: fix conflict
From: |
Carl Hansen |
Subject: |
[Gsrc-commit] trunk r3730: fix conflict |
Date: |
Fri, 17 Jun 2016 07:22:43 +0000 (UTC) |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 3730
revision-id: address@hidden
parent: address@hidden
committer: address@hidden
branch nick: trunk
timestamp: Fri 2016-06-17 00:22:39 -0700
message:
fix conflict
removed:
pkg/other/libffi/Makefile.odl makefile.odl-20160617021831-zlvtnp07nqas2p6o-7
modified:
pkg/other/libffi/config.mk config.mk-20160617021834-1gawmrqbecrjehnr-1
=== removed file 'pkg/other/libffi/Makefile.odl'
--- a/pkg/other/libffi/Makefile.odl 2016-06-17 06:43:09 +0000
+++ b/pkg/other/libffi/Makefile.odl 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-GARNAME = libffi
-GARVERSION = 3.0.11
-HOME_URL = http://sourceware.org/libffi/
-DESCRIPTION = A portable foreign function interface library
-LIBFILES = ffi
-include ../../gar.lib/external.mk
=== modified file 'pkg/other/libffi/config.mk'
--- a/pkg/other/libffi/config.mk 2016-06-17 06:43:09 +0000
+++ b/pkg/other/libffi/config.mk 2016-06-17 07:22:39 +0000
@@ -1,4 +1,11 @@
+<<<<<<< TREE
+## Configuration options ##
+
+CONFIGURE_OPTS ?=
+BUILD_OPTS ?=
+=======
## Configuration options ##
CONFIGURE_OPTS ?=
BUILD_OPTS ?=
+>>>>>>> MERGE-SOURCE
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gsrc-commit] trunk r3730: fix conflict,
Carl Hansen <=