Reverse merged revision(s) 988-987 from VisitFace/RtspNativeCodec: JsonCpp和...

chenke

2017-08-09 a0092014ee12abf06edb1788b189cc7c57336063

1
2
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main"><source path="F:\workspace2\VisitFace\DemoForBsk\app\src\main\shaders"/></dataSet><dataSet config="debug"><source path="F:\workspace2\VisitFace\DemoForBsk\app\src\debug\shaders"/></dataSet></merger>