Index: branches/2017Q4/emulators/ppsspp-devel/Makefile
===================================================================
--- branches/2017Q4/emulators/ppsspp-devel/Makefile	(revision 455009)
+++ branches/2017Q4/emulators/ppsspp-devel/Makefile	(revision 455010)
@@ -1,17 +1,17 @@
 # $FreeBSD$
 
-DISTVERSION=	1.4.2-768
-DISTVERSIONSUFFIX=	-ga0f1276a5
+DISTVERSION=	1.4.2-895
+DISTVERSIONSUFFIX=	-gf8b6a965e
 PORTREVISION?=	0
 PKGNAMESUFFIX?=	-devel
 
 GH_TUPLE=	hrydgard:glslang:2edde666:glslang/ext/glslang \
 		hrydgard:${PORTNAME}-lang:4fddbc9:lang/assets/lang \
 		KhronosGroup:SPIRV-Cross:90966d5:SPIRV/ext/SPIRV-Cross \
-		Kingcom:armips:v0.9-26-g770365d:armips/ext/armips \
+		Kingcom:armips:v0.9-89-g8b4cada:armips/ext/armips \
 		Kingcom:tinyformat:Release-2.0.1-7-gb7f5a22:tinyformat/ext/armips/ext/tinyformat
 
 MASTERDIR=	${.CURDIR}/../ppsspp
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
 .include "${MASTERDIR}/Makefile"
Index: branches/2017Q4/emulators/ppsspp-devel/distinfo
===================================================================
--- branches/2017Q4/emulators/ppsspp-devel/distinfo	(revision 455009)
+++ branches/2017Q4/emulators/ppsspp-devel/distinfo	(revision 455010)
@@ -1,15 +1,15 @@
-TIMESTAMP = 1510589892
+TIMESTAMP = 1511735904
 SHA256 (ppsspp.1) = 64a7cca4c3a5fc6ad5b63399edef9056b0c85ea68fed00fb7e97f4b2724e503b
 SIZE (ppsspp.1) = 1598
-SHA256 (hrydgard-ppsspp-v1.4.2-768-ga0f1276a5_GH0.tar.gz) = e660b0fdf8cefabf0ff75241bb3890d217368df19d835be74ccd91888d85f75f
-SIZE (hrydgard-ppsspp-v1.4.2-768-ga0f1276a5_GH0.tar.gz) = 19002444
+SHA256 (hrydgard-ppsspp-v1.4.2-895-gf8b6a965e_GH0.tar.gz) = 2175ddf8d2f92f4c18f876bf7f005c88e678616d778a31c55af3894dde2bf604
+SIZE (hrydgard-ppsspp-v1.4.2-895-gf8b6a965e_GH0.tar.gz) = 19006983
 SHA256 (hrydgard-glslang-2edde666_GH0.tar.gz) = 9ab09c2aa5a89b2c32297358d25850bec56667aa28fdfe6986fbedd1ced28e78
 SIZE (hrydgard-glslang-2edde666_GH0.tar.gz) = 1941913
 SHA256 (hrydgard-ppsspp-lang-4fddbc9_GH0.tar.gz) = 73d007391fe0cb5f6691ae8d385eeae7eda02992b1a0eb121d265c4c70047d4f
 SIZE (hrydgard-ppsspp-lang-4fddbc9_GH0.tar.gz) = 335675
 SHA256 (KhronosGroup-SPIRV-Cross-90966d5_GH0.tar.gz) = de8bcf01e0a0c4107871fdc8b764771487052fedbe2990a369e7908d4a95c000
 SIZE (KhronosGroup-SPIRV-Cross-90966d5_GH0.tar.gz) = 228783
-SHA256 (Kingcom-armips-v0.9-26-g770365d_GH0.tar.gz) = e6c52967082658082544f83875cc08e50227ff788d3553e0b0bc28abdb2615ed
-SIZE (Kingcom-armips-v0.9-26-g770365d_GH0.tar.gz) = 163606
+SHA256 (Kingcom-armips-v0.9-89-g8b4cada_GH0.tar.gz) = c41aa68bd6798356af568509de4f298485f752f620caae35ff84d17ff798b227
+SIZE (Kingcom-armips-v0.9-89-g8b4cada_GH0.tar.gz) = 191171
 SHA256 (Kingcom-tinyformat-Release-2.0.1-7-gb7f5a22_GH0.tar.gz) = d86b5b4592047254c5118d0639e51d00869b3adc2f2c5419fdf29381ca42011e
 SIZE (Kingcom-tinyformat-Release-2.0.1-7-gb7f5a22_GH0.tar.gz) = 22286
Index: branches/2017Q4
===================================================================
--- branches/2017Q4	(revision 455009)
+++ branches/2017Q4	(revision 455010)

Property changes on: branches/2017Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r454585,454736,455004