summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2013-05-17 02:24:18 -0700
committerRaymond Hettinger <python@rcn.com>2013-05-17 02:24:18 -0700
commit419722168b6494163fe253b03536731c42c2996b (patch)
treee3f85bfefb6dc7f0b0f21d50e320239b11dd148c
parentfff61f2cd328d7f756a15dfa360b3c54bd0f3c30 (diff)
parent0fe236b734883f7a3fb237c94d241ec85f210fe1 (diff)
downloadcpython-git-419722168b6494163fe253b03536731c42c2996b.tar.gz
merge
-rw-r--r--.hgignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.hgignore b/.hgignore
index f07b4ba088..2c0ed631ea 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,7 +1,7 @@
.gdb_history
.purify
.svn/
-DS_Store
+.DS_Store
Makefile$
Makefile.pre$
TAGS$