Skip to content
Snippets Groups Projects
Commit 706f990c authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge branch 'master' into autoconf 

Conflicts:
	CHANGES/Unreleased.txt
	user-doc/Installation.txt
parents 93d934e4 8e9ce48f
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
user-doc/WhatsNew.txt deleted 100644 → 0
+ 0
− 44
View file @ 93d934e4
This diff is collapsed.
user-doc/bibliography.bib
+ 18
− 2
View file @ 706f990c
This diff is collapsed.
user-doc/extract
+ 64
− 49
View file @ 706f990c
This diff is collapsed.
user-doc/tutorials/moving.txt
+ 1
− 1
View file @ 706f990c
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment