changeset 830:d4b3b8370b3c

Merge queued patches. Hg: --
author Augie Fackler <durin42@gmail.com>
date Mon, 10 Oct 2011 08:55:48 -0500
parents 5061640fe5bc (current diff) 4244f8f37484 (diff)
children be5bbb2f2d68
files .hgignore
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore
+++ b/.hgignore
@@ -12,6 +12,7 @@ MANIFEST
 dist
 *.egg-info
 hgsubversion/__version__.py
+nbproject
 .project
 .pydevproject
 .settings