Merge branch 'master' into netgen-1.5

"ocd_git_pure automatic update to repo"
2019-08-11 03:00:07 -04:00 · 2019-08-04 03:00:20 -04:00 · 2019-08-04 03:00:20 -04:00 · 2019-07-25 03:00:16 -04:00 · 2019-07-25 03:00:16 -04:00 · 2019-07-15 03:00:27 -04:00
2 changed files with 1 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -12,4 +12,3 @@ scripts/config.status
 *~
 *.log
 UPDATE_ME
 VERSION
--- a/2
+++ b/2
@ -1 +1 @@
-1.5.117
+1.5.126
Author	SHA1	Message	Date
Tim Edwards	205cf2aa58	Merge branch 'master' into netgen-1.5	2019-08-11 03:00:07 -04:00
Tim Edwards	52b6766fc8	"ocd_git_pure automatic update to repo"	2019-08-04 03:00:20 -04:00
Tim Edwards	7b0bdd29e8	Merge branch 'master' into netgen-1.5	2019-08-04 03:00:20 -04:00
Tim Edwards	433cbd090a	"ocd_git_pure automatic update to repo"	2019-07-25 03:00:16 -04:00
Tim Edwards	3087bd3337	Merge branch 'master' into netgen-1.5	2019-07-25 03:00:16 -04:00
Tim Edwards	b79a29d662	"ocd_git_pure automatic update to repo"	2019-07-15 03:00:27 -04:00
Tim Edwards	bf9c61e412	Merge branch 'master' into netgen-1.5	2019-07-15 03:00:27 -04:00
Tim Edwards	8d34bd372d	"ocd_git_pure automatic update to repo"	2019-07-03 03:00:22 -04:00
Tim Edwards	229c2931a8	Merge branch 'master' into netgen-1.5	2019-07-03 03:00:22 -04:00
Tim Edwards	b8da97deb1	"ocd_git_pure automatic update to repo"	2019-06-16 03:00:15 -04:00
Tim Edwards	b7187d5899	Merge branch 'master' into netgen-1.5	2019-06-16 03:00:15 -04:00
Tim Edwards	d27d441c58	"ocd_git_pure automatic update to repo"	2019-06-13 03:00:05 -04:00
Tim Edwards	48c9e6b292	Merge branch 'master' into netgen-1.5	2019-06-13 03:00:05 -04:00
Tim Edwards	ced5846da3	"ocd_git_pure automatic update to repo"	2019-05-18 03:00:05 -04:00
Tim Edwards	b99d33064f	Merge branch 'master' into netgen-1.5	2019-05-18 03:00:04 -04:00
Tim Edwards	399472e940	"ocd_git_pure automatic update to repo"	2019-05-07 09:13:00 -04:00