Skip to content
Snippets Groups Projects
Commit 888693c0 authored by Loïc Correnson's avatar Loïc Correnson
Browse files

Merge branch 'master' into feature/isrn/merge-manganese

# Conflicts:
#	ivette/Makefile.distrib
#	ivette/distrib.sh
#	ivette/headers/header_spec.txt
#	ivette/src/frama-c/index.tsx
#	ivette/src/frama-c/kernel/ASTinfo.tsx
#	ivette/src/frama-c/kernel/ASTview.tsx
#	ivette/src/frama-c/kernel/api/ast/index.ts
#	ivette/src/frama-c/kernel/style.css
#	ivette/src/frama-c/richtext.tsx
#	ivette/src/frama-c/server.ts
#	ivette/src/frama-c/utils.ts
#	ivette/src/frama-c/utils.tsx
#	ivette/src/renderer/Controller.tsx
#	src/plugins/server/kernel_ast.ml
#	src/plugins/server/kernel_ast.mli
#	src/plugins/server/server_socket.ml
parents 6958de67 6988ab5c
No related branches found
No related tags found
No related merge requests found
Showing with 451 additions and 272 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment