- Source fix

This commit is contained in:
Helio Chissini de Castro 2015-12-10 22:15:36 +01:00
parent 3d974078ce
commit c40caea88d

View File

@ -1,5 +1 @@
<<<<<<< HEAD
305e520f85d11dc666291853e862e50d qtscript-opensource-src-5.6.0-beta.tar.gz 305e520f85d11dc666291853e862e50d qtscript-opensource-src-5.6.0-beta.tar.gz
=======
d49e0b0151802ecc68e3eebbb6f39c56 qtscript-opensource-src-5.6.0-beta1.tar.xz
>>>>>>> 97c0d990280cede7801671aa2397119e7d8dd9dd