Merge branch 'master' into netgen-1.5

Updated VERSION manually; checking regeneration of tarball.
Corrected Makefile to use -include instead of include on defs.mak
2026-08-28 08:57:30 +02:00 · 2020-02-24 17:35:04 -05:00 · 2020-02-24 17:34:38 -05:00 · 2020-02-24 17:31:06 -05:00 · 2020-02-24 16:39:19 -05:00 · 2020-02-24 16:38:56 -05:00
2 changed files with 2 additions and 2 deletions
@@ -9,7 +9,7 @@ MODULES = base
 MAKEFLAGS =
 INSTALL_CAD_DIRS = lib doc

-include defs.mak
+-include defs.mak

 all:	$(ALL_TARGET)

@@ -1 +1 @@
-1.5.137
+1.5.141
Author	SHA1	Message	Date
Tim Edwards	dc841f3293	Merge branch 'master' into netgen-1.5	2020-02-24 17:35:04 -05:00
Tim Edwards	f7037fc9e6	Updated VERSION manually; checking regeneration of tarball.	2020-02-24 17:34:38 -05:00
Tim Edwards	23fb9356f4	Corrected Makefile to use -include instead of include on defs.mak so that "make distclean" works.	2020-02-24 17:31:06 -05:00
Tim Edwards	05bcfede69	Merge branch 'master' into netgen-1.5	2020-02-24 16:39:19 -05:00
Tim Edwards	027b4ae468	Test update of VERSION.	2020-02-24 16:38:56 -05:00
Tim Edwards	72ed78e55a	Update for change in ocd git script	2020-02-24 15:04:59 -05:00
Tim Edwards	59bb8a89c0	"ocd_git_pure automatic update to repo"	2020-02-24 15:04:27 -05:00
Tim Edwards	08a442fda2	Removed VERSION from .gitignore, and updated VERSION.	2020-02-24 11:50:38 -05:00
Tim Edwards	9bdaee652e	"ocd_git_pure automatic update to repo"	2020-02-18 03:00:14 -05:00
@@ -1 +1 @@
 .5.137
 .5.141