Use merged in FreeTouch

This commit is contained in:
Scott Shawcroft 2018-05-23 11:55:38 -07:00
parent 6af5fc2796
commit aa86a1457f

@ -1 +1 @@
Subproject commit 5d8c33e084996d48134eaf7d4b200d1a806cb9ee
Subproject commit b6859a349efb79e2008d6f6a34e406e93a8e19c0