Merge branch 'srtm-multi-sources' into fp-integration

author Frédéric Perrin <fred@fperrin.net>

Sat, 30 Nov 2019 20:50:21 +0000 (20:50 +0000)

committer Frédéric Perrin <fred@fperrin.net>

Sat, 30 Nov 2019 20:50:21 +0000 (20:50 +0000)
author Frédéric Perrin <fred@fperrin.net>
Sat, 30 Nov 2019 20:50:21 +0000 (20:50 +0000)
committer Frédéric Perrin <fred@fperrin.net>
Sat, 30 Nov 2019 20:50:21 +0000 (20:50 +0000)
diff --cc src/tim/prune/FunctionLibrary.java
Simple merge
diff --cc src/tim/prune/gui/MenuManager.java
Simple merge
diff --cc src/tim/prune/lang/prune-texts_en.properties
Simple merge
author	Frédéric Perrin <fred@fperrin.net>
	Sat, 30 Nov 2019 20:50:21 +0000 (20:50 +0000)
committer	Frédéric Perrin <fred@fperrin.net>
	Sat, 30 Nov 2019 20:50:21 +0000 (20:50 +0000)
		1	2
src/tim/prune/FunctionLibrary.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/tim/prune/gui/MenuManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/tim/prune/lang/prune-texts_en.properties	patch \|	diff1 \|	diff2 \|	blob \| history