summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2016-04-17 17:00:35 -0700
committerMichael Forney <mforney@mforney.org>2016-04-17 17:00:38 -0700
commitd5317aa890a2a39c0267990b2d0822ae9ca0a7ee (patch)
treeb544a5f15e0ad3b130171998fea866088349e14e
parent3ce9a9abf5dc913550a9d3fc9bbd073e3095e935 (diff)
file: Update to 5.26
Also, include some subsequent commits needed to fix the build.
-rw-r--r--core/file/gen.rc3
m---------core/file/src0
2 files changed, 2 insertions, 1 deletions
diff --git a/core/file/gen.rc b/core/file/gen.rc
index 78fef89c..b1c7cd53 100644
--- a/core/file/gen.rc
+++ b/core/file/gen.rc
@@ -1,4 +1,4 @@
-version=5.25
+version=5.26
cflags\
-DHAVE_CONFIG_H\
-DVERSION'='\"$version\"\
@@ -41,6 +41,7 @@ srcs=src/^(\
fsmagic.c\
funcs.c\
apptype.c\
+ der.c\
cdf.c\
cdf_time.c\
readcdf.c\
diff --git a/core/file/src b/core/file/src
-Subproject f45db89ddc91692b662fffbabbdafc7bc4c00f5
+Subproject 89fb0ca30034d2f01856ca24e1798b18a99b38e