opps

2016-06-14 00:41:49 +03:00
parent 7ca6361645 a702ec9aec
commit f24632cfc6
3 changed files with 18 additions and 2 deletions
@@ -65,6 +65,7 @@
            <Patch level="1">tr_segfault_fix.patch</Patch>
            <Patch level="1">deepbind.patch</Patch>
            <Patch level="1">lpthread.patch</Patch>
+            <Patch level="1">xine-lib-ffmpeg3.patch</Patch>
        </Patches>
    </Source>

@@ -137,7 +138,11 @@

    <History>
        <Update release="2">
+<<<<<<< HEAD
            <Date>2016-06-14</Date>
+=======
+            <Date>2016-06-13</Date>
+>>>>>>> a702ec9aec8c201fc9985eed2bed7e5b675a5129
            <Version>1.2.6</Version>
            <Comment>Release Bump.</Comment>
            <Name>Pisi Linux Community</Name>