diff options
author | C Nelson <cnelsonsic@gmail.com> | 2012-04-17 20:38:35 -0500 |
---|---|---|
committer | C Nelson <cnelsonsic@gmail.com> | 2012-04-17 20:38:35 -0500 |
commit | dac0a54debcb1ec2e894970e14766bf46f654132 (patch) | |
tree | f271ffd1eba60ff2469cd8a82e9cd4fbd29e8b60 | |
parent | f19bd8638ee329da200f9ce138c36136b6fef0ff (diff) | |
parent | 61ff35c18185ff1a919b24b1dc5559aa4f1aee84 (diff) |
Merge remote-tracking branch 'upstream/master'
-rw-r--r-- | .gitignore (renamed from .hgignore) | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -1,5 +1,3 @@ -syntax: glob - #precompiled python *.pyc |