.hgignore
author Merge Script
Mon, 11 Apr 2016 06:39:23 +0200
branchjv
changeset 3641 932386e8e463
parent 3505 af4fb19df063
permissions -rw-r--r--
Merge
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3505
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     1
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     2
syntax: glob
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     3
*Init.c   
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     4
makefile
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     5
*.so
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     6
*.H
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     7
*.o
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     8
*.STH
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     9
*.sc
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    10
objbc
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    11
objvc
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    12
*.class
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    13
java/libs/*.jar
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    14
java/libs-src/*.jar
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    15
*-Test.xml
af4fb19df063 PNGReader: added support for reading 8bit alpha channel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    16
st.chg