Skip to content

Commit 3cf6908

Browse files
authored
Merge pull request #410 from MethodicalAcceleratorDesign/dev
merge dev to master for 0.9.7
2 parents 405db41 + e58dcec commit 3cf6908

File tree

278 files changed

+107921
-18383
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

278 files changed

+107921
-18383
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ lib/nlopt2
2121
lib/lfs1
2222
lib/lpeg
2323
src/build
24+
tests
2425
tests/utests/*_gen.mad
2526
tests/utests/*.tfs
2627

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
[submodule "MADdocs"]
22
path = doc
33
url = https://github.com/MethodicalAcceleratorDesign/MADdocs
4+
update = merge
45
[submodule "MADLibs"]
56
path = bin
67
url = https://github.com/MethodicalAcceleratorDesign/MADLibs
8+
update = merge
79
[submodule "MADpy"]
810
path = pymad
911
url = https://github.com/MethodicalAcceleratorDesign/MADpy
12+
update = merge

doc

Submodule doc updated from 0317694 to 05f842e

docs/Makefile

Lines changed: 0 additions & 20 deletions
This file was deleted.

docs/make.bat

Lines changed: 0 additions & 35 deletions
This file was deleted.

docs/source/_ext/customRoles.py

Lines changed: 0 additions & 35 deletions
This file was deleted.

docs/source/_ext/pygments_mad_lexer.py

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)