summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-03 04:50:46 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-03 04:50:46 +0200
commit29de55140caf6b28a8147290436981dc90b90333 (patch)
tree280e230a5c06265e8159a9a0ba955c7c1f50c6ac /misc
parent53e35bf59a7106fabd7d10e24190919e44dbf792 (diff)
parent2a1cde453a5a08542963c7a02443056e94249124 (diff)
downloadxine-lib-29de55140caf6b28a8147290436981dc90b90333.tar.gz
xine-lib-29de55140caf6b28a8147290436981dc90b90333.tar.bz2
Merge tonight's changes to main branch.
Diffstat (limited to 'misc')
-rw-r--r--misc/.hgignore2
-rw-r--r--misc/fonts/.hgignore2
2 files changed, 0 insertions, 4 deletions
diff --git a/misc/.hgignore b/misc/.hgignore
index fe4e75d06..e126a36c8 100644
--- a/misc/.hgignore
+++ b/misc/.hgignore
@@ -1,5 +1,3 @@
-Makefile
-Makefile.in
SlackBuild
build_rpms.sh
libxine.pc
diff --git a/misc/fonts/.hgignore b/misc/fonts/.hgignore
deleted file mode 100644
index 282522db0..000000000
--- a/misc/fonts/.hgignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in