Tim Edwards
f966446036
Merge branch 'master' into magic-8.2
2020-02-24 17:26:35 -05:00
Tim Edwards
21756ae4cf
Merge branch 'master' into magic-8.2
2020-02-24 17:21:42 -05:00
Tim Edwards
eb7e64da22
Added back VERSION file (will handle differently in scripts)
2020-02-24 10:25:50 -05:00
Tim Edwards
8159800192
Merge branch 'master' into magic-8.2
2020-02-24 10:10:25 -05:00
Tim Edwards
dd0e875592
Removed VERSION from gitignore; will rewrite scripts to handle
...
it properly without causing perpetual updates.
2020-02-24 10:10:06 -05:00
Tim Edwards
611792748c
Merge branch 'master' into magic-8.2
...
Conflicts:
VERSION
Git was messed up because VERSION was in .gitignore but was not
removed with "git rm". Fixing now.
2020-02-24 10:00:17 -05:00
Tim Edwards
10c5b282d4
Merge branch 'master' into magic-8.2
2020-02-20 10:52:28 -05:00
Tim Edwards
94b1c53b8f
Merge branch 'master' into magic-8.2
...
Conflicts:
.gitignore
Commit of .gitignore, although I have no idea why it was flagged
with a merge conflict, or why git can't just overwrite it with a pull.
2020-02-20 10:50:50 -05:00
Tim Edwards
6c55c955e2
"ocd_git_pure automatic update to repo"
2020-01-30 03:00:31 -05:00
Tim Edwards
a722332115
Merge branch 'master' into magic-8.2
2020-01-30 03:00:30 -05:00
Tim Edwards
bebd603296
"ocd_git_pure automatic update to repo"
2020-01-25 03:00:08 -05:00
Tim Edwards
003cf81a11
Merge branch 'master' into magic-8.2
2020-01-25 03:00:08 -05:00
Tim Edwards
594fc581c5
"ocd_git_pure automatic update to repo"
2020-01-19 03:00:06 -05:00
Tim Edwards
7eb7daa48c
Merge branch 'master' into magic-8.2
2020-01-19 03:00:05 -05:00
Tim Edwards
3d595e7982
"ocd_git_pure automatic update to repo"
2020-01-18 03:00:06 -05:00
Tim Edwards
71678d4e07
Merge branch 'master' into magic-8.2
2020-01-18 03:00:06 -05:00
Tim Edwards
21fef506ea
"ocd_git_pure automatic update to repo"
2020-01-14 03:00:07 -05:00
Tim Edwards
eded9bb913
Merge branch 'master' into magic-8.2
2020-01-14 03:00:06 -05:00
Tim Edwards
dce525c588
"ocd_git_pure automatic update to repo"
2020-01-04 03:00:05 -05:00
Tim Edwards
d3d3f9d220
Merge branch 'master' into magic-8.2
2020-01-04 03:00:05 -05:00
Tim Edwards
457ae2402a
"ocd_git_pure automatic update to repo"
2020-01-03 03:00:07 -05:00
Tim Edwards
2311f1aee4
Merge branch 'master' into magic-8.2
2020-01-03 03:00:07 -05:00
Tim Edwards
bc1bb5c846
"ocd_git_pure automatic update to repo"
2019-12-20 03:00:06 -05:00
Tim Edwards
b6372775a0
Merge branch 'master' into magic-8.2
2019-12-20 03:00:05 -05:00
Tim Edwards
e526a179f7
"ocd_git_pure automatic update to repo"
2019-12-17 03:00:05 -05:00
Tim Edwards
aadc69f722
Merge branch 'master' into magic-8.2
2019-12-17 03:00:05 -05:00
Tim Edwards
7d65d6d4c2
"ocd_git_pure automatic update to repo"
2019-12-15 03:00:06 -05:00
Tim Edwards
81d7801223
Merge branch 'master' into magic-8.2
2019-12-15 03:00:06 -05:00
Tim Edwards
2a56630394
"ocd_git_pure automatic update to repo"
2019-12-09 03:00:06 -05:00
Tim Edwards
76dc836dca
Merge branch 'master' into magic-8.2
2019-12-09 03:00:06 -05:00
Tim Edwards
b0aa35133b
"ocd_git_pure automatic update to repo"
2019-12-03 03:00:06 -05:00
Tim Edwards
1c4282b65a
Merge branch 'master' into magic-8.2
2019-12-03 03:00:06 -05:00
Tim Edwards
584a677e9b
"ocd_git_pure automatic update to repo"
2019-11-28 03:00:05 -05:00
Tim Edwards
48c033b1bf
Merge branch 'master' into magic-8.2
2019-11-28 03:00:05 -05:00
Tim Edwards
7941411707
"ocd_git_pure automatic update to repo"
2019-11-27 03:00:06 -05:00
Tim Edwards
acffebf380
Merge branch 'master' into magic-8.2
2019-11-27 03:00:06 -05:00
Tim Edwards
4daa652aff
"ocd_git_pure automatic update to repo"
2019-11-26 03:00:07 -05:00
Tim Edwards
22a7922083
Merge branch 'master' into magic-8.2
2019-11-26 03:00:06 -05:00
Tim Edwards
6117f347d4
"ocd_git_pure automatic update to repo"
2019-11-24 03:00:11 -05:00
Tim Edwards
53c4cb5b1b
Merge branch 'master' into magic-8.2
2019-11-24 03:00:11 -05:00
Tim Edwards
2019a8a665
"ocd_git_pure automatic update to repo"
2019-11-22 03:00:07 -05:00
Tim Edwards
9939a8b874
Merge branch 'master' into magic-8.2
2019-11-22 03:00:07 -05:00
Tim Edwards
7a228bebc6
"ocd_git_pure automatic update to repo"
2019-11-21 03:00:05 -05:00
Tim Edwards
6fe5cee4be
Merge branch 'master' into magic-8.2
2019-11-21 03:00:05 -05:00
Tim Edwards
4f91f962a4
"ocd_git_pure automatic update to repo"
2019-11-20 03:00:05 -05:00
Tim Edwards
1c499c2593
Merge branch 'master' into magic-8.2
2019-11-20 03:00:05 -05:00
Tim Edwards
90a2cc4fdc
"ocd_git_pure automatic update to repo"
2019-11-18 03:00:06 -05:00
Tim Edwards
85d9659741
Merge branch 'master' into magic-8.2
2019-11-18 03:00:06 -05:00
Tim Edwards
a699b03a7e
"ocd_git_pure automatic update to repo"
2019-11-16 03:00:05 -05:00
Tim Edwards
c77dd1fb49
Merge branch 'master' into magic-8.2
2019-11-16 03:00:05 -05:00
Tim Edwards
1052fa3389
"ocd_git_pure automatic update to repo"
2019-11-15 03:00:07 -05:00
Tim Edwards
3bd8c1697d
Merge branch 'master' into magic-8.2
2019-11-15 03:00:06 -05:00
Tim Edwards
4f86d29848
"ocd_git_pure automatic update to repo"
2019-11-14 03:00:05 -05:00
Tim Edwards
c17a546a75
Merge branch 'master' into magic-8.2
2019-11-14 03:00:05 -05:00
Tim Edwards
5164a8dfca
"ocd_git_pure automatic update to repo"
2019-11-13 03:00:07 -05:00
Tim Edwards
9f15e9bc7a
Merge branch 'master' into magic-8.2
2019-11-13 03:00:07 -05:00
Tim Edwards
695bcc91f0
"ocd_git_pure automatic update to repo"
2019-11-12 03:00:06 -05:00
Tim Edwards
ba731b5a51
Merge branch 'master' into magic-8.2
2019-11-12 03:00:06 -05:00
Tim Edwards
5cc6d39138
"ocd_git_pure automatic update to repo"
2019-11-02 03:00:05 -04:00
Tim Edwards
13d087bae9
Merge branch 'master' into magic-8.2
2019-11-02 03:00:05 -04:00
Tim Edwards
c6b5843266
"ocd_git_pure automatic update to repo"
2019-11-01 03:00:05 -04:00
Tim Edwards
6f02772e35
Merge branch 'master' into magic-8.2
2019-11-01 03:00:05 -04:00
Tim Edwards
e4d8f5eb6f
"ocd_git_pure automatic update to repo"
2019-10-30 03:00:09 -04:00
Tim Edwards
131728190c
Merge branch 'master' into magic-8.2
2019-10-30 03:00:09 -04:00
Tim Edwards
0d30c9ed50
"ocd_git_pure automatic update to repo"
2019-10-29 03:00:11 -04:00
Tim Edwards
33e68615bd
Merge branch 'master' into magic-8.2
2019-10-29 03:00:10 -04:00
Tim Edwards
e3409d5f18
"ocd_git_pure automatic update to repo"
2019-10-26 03:00:06 -04:00
Tim Edwards
14244d6904
Merge branch 'master' into magic-8.2
2019-10-26 03:00:06 -04:00
Tim Edwards
7580f226df
"ocd_git_pure automatic update to repo"
2019-10-25 03:00:11 -04:00
Tim Edwards
05f9f8e7f7
Merge branch 'master' into magic-8.2
2019-10-25 03:00:10 -04:00
Tim Edwards
0228a18da9
"ocd_git_pure automatic update to repo"
2019-10-24 03:00:05 -04:00
Tim Edwards
6152fb01c6
Merge branch 'master' into magic-8.2
2019-10-24 03:00:05 -04:00
Tim Edwards
a411895dee
"ocd_git_pure automatic update to repo"
2019-10-21 03:00:05 -04:00
Tim Edwards
f65a442c45
Merge branch 'master' into magic-8.2
2019-10-21 03:00:04 -04:00
Tim Edwards
418002b8ec
"ocd_git_pure automatic update to repo"
2019-10-19 03:00:06 -04:00
Tim Edwards
56c1829610
Merge branch 'master' into magic-8.2
2019-10-19 03:00:05 -04:00
Tim Edwards
0d508b18b7
"ocd_git_pure automatic update to repo"
2019-10-18 03:00:06 -04:00
Tim Edwards
bc694cea43
Merge branch 'master' into magic-8.2
2019-10-18 03:00:06 -04:00
Tim Edwards
5797971480
"ocd_git_pure automatic update to repo"
2019-10-17 03:00:07 -04:00
Tim Edwards
42031c45ff
Merge branch 'master' into magic-8.2
2019-10-17 03:00:07 -04:00
Tim Edwards
26357d3c4f
"ocd_git_pure automatic update to repo"
2019-10-16 03:00:07 -04:00
Tim Edwards
1bcf93616f
Merge branch 'master' into magic-8.2
2019-10-16 03:00:06 -04:00
Tim Edwards
1578c87922
"ocd_git_pure automatic update to repo"
2019-10-15 03:00:06 -04:00
Tim Edwards
1a1d5898f2
Merge branch 'master' into magic-8.2
2019-10-15 03:00:05 -04:00
Tim Edwards
271d9033cf
"ocd_git_pure automatic update to repo"
2019-10-03 03:00:08 -04:00
Tim Edwards
e5b7ba3abf
Merge branch 'master' into magic-8.2
2019-10-03 03:00:07 -04:00
Tim Edwards
497b75f731
"ocd_git_pure automatic update to repo"
2019-10-02 03:00:05 -04:00
Tim Edwards
4ae5dcd28e
Merge branch 'master' into magic-8.2
2019-10-02 03:00:04 -04:00
Tim Edwards
8280e60e43
"ocd_git_pure automatic update to repo"
2019-09-20 03:00:03 -04:00
Tim Edwards
b05876d22e
Merge branch 'master' into magic-8.2
2019-09-20 03:00:03 -04:00
Tim Edwards
ad8664a8f7
"ocd_git_pure automatic update to repo"
2019-09-19 03:00:04 -04:00
Tim Edwards
51fd4f8e93
Merge branch 'master' into magic-8.2
2019-09-19 03:00:04 -04:00
Tim Edwards
47668a342e
"ocd_git_pure automatic update to repo"
2019-09-14 03:00:05 -04:00
Tim Edwards
a170fde1ba
Merge branch 'master' into magic-8.2
2019-09-14 03:00:04 -04:00
Tim Edwards
aef8dc9c60
"ocd_git_pure automatic update to repo"
2019-09-04 03:00:05 -04:00
Tim Edwards
d63ce36cbd
Merge branch 'master' into magic-8.2
2019-09-04 03:00:05 -04:00
Tim Edwards
d3fa72dce4
"ocd_git_pure automatic update to repo"
2019-08-25 03:00:04 -04:00
Tim Edwards
a765279e5f
Merge branch 'master' into magic-8.2
2019-08-25 03:00:04 -04:00
Tim Edwards
75844adf8e
"ocd_git_pure automatic update to repo"
2019-08-24 03:00:05 -04:00
Tim Edwards
4edfd1a501
Merge branch 'master' into magic-8.2
2019-08-24 03:00:04 -04:00
Tim Edwards
1d2686ef82
"ocd_git_pure automatic update to repo"
2019-08-21 03:00:05 -04:00
Tim Edwards
f9f3bb3063
Merge branch 'master' into magic-8.2
2019-08-21 03:00:05 -04:00
Tim Edwards
50a2dfa40d
"ocd_git_pure automatic update to repo"
2019-08-20 03:00:04 -04:00
Tim Edwards
5c614c3d64
Merge branch 'master' into magic-8.2
2019-08-20 03:00:04 -04:00
Tim Edwards
6274abf997
"ocd_git_pure automatic update to repo"
2019-08-10 03:00:05 -04:00
Tim Edwards
ba53a7d897
Merge branch 'master' into magic-8.2
2019-08-10 03:00:05 -04:00
Tim Edwards
a6d6e044a8
"ocd_git_pure automatic update to repo"
2019-08-04 03:00:04 -04:00
Tim Edwards
ec28ac3c79
Merge branch 'master' into magic-8.2
2019-08-04 03:00:04 -04:00
Tim Edwards
0b10203a44
"ocd_git_pure automatic update to repo"
2019-08-03 03:00:04 -04:00
Tim Edwards
528863f378
Merge branch 'master' into magic-8.2
2019-08-03 03:00:04 -04:00
Tim Edwards
68b317d7a7
"ocd_git_pure automatic update to repo"
2019-07-30 03:00:04 -04:00
Tim Edwards
053322fa0f
Merge branch 'master' into magic-8.2
2019-07-30 03:00:04 -04:00
Tim Edwards
58b07c4bca
"ocd_git_pure automatic update to repo"
2019-07-26 03:00:04 -04:00
Tim Edwards
8a01ea8a58
Merge branch 'master' into magic-8.2
2019-07-26 03:00:04 -04:00
Tim Edwards
20df6ec4a5
"ocd_git_pure automatic update to repo"
2019-07-25 03:00:03 -04:00
Tim Edwards
ce9d9c4532
Merge branch 'master' into magic-8.2
2019-07-25 03:00:03 -04:00
Tim Edwards
65c2d50fb1
"ocd_git_pure automatic update to repo"
2019-07-24 03:00:04 -04:00
Tim Edwards
c668b3dd03
Merge branch 'master' into magic-8.2
2019-07-24 03:00:04 -04:00
Tim Edwards
e00813e599
"ocd_git_pure automatic update to repo"
2019-07-20 03:00:05 -04:00
Tim Edwards
d3e601c071
Merge branch 'master' into magic-8.2
2019-07-20 03:00:05 -04:00
Tim Edwards
67ebfbde44
"ocd_git_pure automatic update to repo"
2019-07-18 03:00:06 -04:00
Tim Edwards
52ee7e962d
Merge branch 'master' into magic-8.2
2019-07-18 03:00:05 -04:00
Tim Edwards
2b412ed197
"ocd_git_pure automatic update to repo"
2019-07-17 03:00:05 -04:00
Tim Edwards
fa0dc58462
Merge branch 'master' into magic-8.2
2019-07-17 03:00:05 -04:00
Tim Edwards
58fd733ef7
"ocd_git_pure automatic update to repo"
2019-07-15 03:00:05 -04:00
Tim Edwards
75f8ec66dd
Merge branch 'master' into magic-8.2
2019-07-15 03:00:04 -04:00
Tim Edwards
968db62a88
"ocd_git_pure automatic update to repo"
2019-07-09 03:00:04 -04:00
Tim Edwards
895f551c75
Merge branch 'master' into magic-8.2
2019-07-09 03:00:04 -04:00
Tim Edwards
31bd6c295e
"ocd_git_pure automatic update to repo"
2019-07-05 03:00:05 -04:00
Tim Edwards
6d7da2a3da
Merge branch 'master' into magic-8.2
2019-07-05 03:00:05 -04:00
Tim Edwards
9cb0f37a0b
"ocd_git_pure automatic update to repo"
2019-07-03 03:00:04 -04:00
Tim Edwards
ff8fcbd8cd
Merge branch 'master' into magic-8.2
2019-07-03 03:00:04 -04:00
Tim Edwards
7395f965a2
"ocd_git_pure automatic update to repo"
2019-06-08 03:00:04 -04:00
Tim Edwards
2ab7f842bd
Merge branch 'master' into magic-8.2
2019-06-08 03:00:04 -04:00
Tim Edwards
c89410038f
"ocd_git_pure automatic update to repo"
2019-06-07 03:00:04 -04:00
Tim Edwards
d1ae6b55a1
Merge branch 'master' into magic-8.2
2019-06-07 03:00:04 -04:00
Tim Edwards
e37d5de07b
"ocd_git_pure automatic update to repo"
2019-06-06 03:00:03 -04:00
Tim Edwards
51d61c1d05
Merge branch 'master' into magic-8.2
2019-06-06 03:00:03 -04:00
Tim Edwards
bb61eb8f67
"ocd_git_pure automatic update to repo"
2019-06-05 03:00:04 -04:00
Tim Edwards
797244cff9
Merge branch 'master' into magic-8.2
2019-06-05 03:00:04 -04:00
Tim Edwards
4d9f7715ce
"ocd_git_pure automatic update to repo"
2019-05-29 03:00:04 -04:00
Tim Edwards
fa8cbae14d
Merge branch 'master' into magic-8.2
2019-05-29 03:00:03 -04:00
Tim Edwards
57a96c7fdb
"ocd_git_pure automatic update to repo"
2019-05-23 03:00:05 -04:00
Tim Edwards
1c144398b2
Merge branch 'master' into magic-8.2
2019-05-23 03:00:04 -04:00
Tim Edwards
622d5374a1
"ocd_git_pure automatic update to repo"
2019-05-17 03:00:03 -04:00
Tim Edwards
4ab54a1e6c
Merge branch 'master' into magic-8.2
2019-05-17 03:00:03 -04:00
Tim Edwards
49590fda3c
"ocd_git_pure automatic update to repo"
2019-05-12 03:00:03 -04:00
Tim Edwards
140fd5cf5a
Merge branch 'master' into magic-8.2
2019-05-12 03:00:03 -04:00
Tim Edwards
ae04ff6d3e
"ocd_git_pure automatic update to repo"
2019-05-07 03:00:03 -04:00
Tim Edwards
b1899186ab
Merge branch 'master' into magic-8.2
2019-05-07 03:00:03 -04:00
Tim Edwards
cbeb62d0e5
"ocd_git_pure automatic update to repo"
2019-05-04 03:00:03 -04:00
Tim Edwards
67875c1c8b
Merge branch 'master' into magic-8.2
2019-05-04 03:00:03 -04:00
Tim Edwards
328923228d
Merge branch 'master' into magic-8.2
2019-04-25 03:00:03 -04:00
Tim Edwards
8e471022db
Merge branch 'master' into magic-8.2
2019-04-24 03:00:04 -04:00
Tim Edwards
1c3a5b878e
"ocd_git_pure automatic update to repo"
2019-04-11 03:00:03 -04:00
Tim Edwards
2c3e7a5ce2
"ocd_git_pure automatic update to repo"
2019-04-10 03:00:03 -04:00
Tim Edwards
beb5ee890c
"ocd_git_pure automatic update to repo"
2019-04-09 03:00:04 -04:00
Tim Edwards
2a438a395d
"ocd_git_pure automatic update to repo"
2019-04-08 03:00:02 -04:00
Tim Edwards
79f71b28f3
"ocd_git_pure automatic update to repo"
2019-04-07 03:00:03 -04:00
Tim Edwards
1882183cb0
"ocd_git_pure automatic update to repo"
2019-04-06 03:00:03 -04:00
Tim Edwards
9d322165bd
"ocd_git_pure automatic update to repo"
2019-04-05 03:00:02 -04:00
Tim Edwards
c8ac63697b
ocd_git_pure automatic update to repo
2019-04-04 09:41:35 -04:00