summaryrefslogtreecommitdiff
path: root/libffi/MERGE
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2021-08-31 07:14:47 -0700
committerH.J. Lu <hjl.tools@gmail.com>2021-10-20 05:35:52 -0700
commit92456a4e5658e138e2cea79e390e3306b07685b0 (patch)
tree6ef878e933b504a902035f1ae89510fde96a976d /libffi/MERGE
parentd738405e7fe62cc8eb9580948a6ea39005cd7170 (diff)
libffi: Sync with libffi 3.4.2
Merged commit: f9ea41683444ebe11cfa45b05223899764df28fb
Diffstat (limited to 'libffi/MERGE')
-rw-r--r--libffi/MERGE4
1 files changed, 4 insertions, 0 deletions
diff --git a/libffi/MERGE b/libffi/MERGE
new file mode 100644
index 00000000000..fd0076e6509
--- /dev/null
+++ b/libffi/MERGE
@@ -0,0 +1,4 @@
+f9ea41683444ebe11cfa45b05223899764df28fb
+
+The first line of this file holds the git revision number of the
+last merge done from the master library sources.