summaryrefslogtreecommitdiffstatshomepage
path: root/.gitattributes
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2010-06-16 18:04:30 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2010-06-16 18:04:30 +0000
commit848bf53c3d7e1093f262a9b8826e662dfb5fa473 (patch)
treead8a809802a1b7a7d6531234b87abb81adfd453e /.gitattributes
parentbd1a98805c1b5269ce1f36b150bc085896a016bc (diff)
- moved opresolv and zippath into /lib/util from MESS [Miodrag Milanovic]
- removed ifdef MESS from osd part since calls are needed by zippath
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes6
1 files changed, 4 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes
index 368f68ec80e..79b1a19343a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -792,8 +792,6 @@ src/emu/mconfig.h svneol=native#text/plain
src/emu/memconv.h svneol=native#text/plain
src/emu/memory.c svneol=native#text/plain
src/emu/memory.h svneol=native#text/plain
-src/emu/opresolv.c svneol=native#text/plain
-src/emu/opresolv.h svneol=native#text/plain
src/emu/output.c svneol=native#text/plain
src/emu/output.h svneol=native#text/plain
src/emu/profiler.c svneol=native#text/plain
@@ -1153,6 +1151,8 @@ src/lib/util/jedparse.c svneol=native#text/plain
src/lib/util/jedparse.h svneol=native#text/plain
src/lib/util/md5.c svneol=native#text/plain
src/lib/util/md5.h svneol=native#text/plain
+src/lib/util/opresolv.c svneol=native#text/plain
+src/lib/util/opresolv.h svneol=native#text/plain
src/lib/util/options.c svneol=native#text/plain
src/lib/util/options.h svneol=native#text/plain
src/lib/util/palette.c svneol=native#text/plain
@@ -1173,6 +1173,8 @@ src/lib/util/vbiparse.c svneol=native#text/plain
src/lib/util/vbiparse.h svneol=native#text/plain
src/lib/util/xmlfile.c svneol=native#text/plain
src/lib/util/xmlfile.h svneol=native#text/plain
+src/lib/util/zippath.c svneol=native#text/plain
+src/lib/util/zippath.h svneol=native#text/plain
src/lib/zlib/Makefile svneol=native#text/plain
src/lib/zlib/Makefile.in svneol=native#text/plain
src/lib/zlib/adler32.c svneol=native#text/plain