~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/__init__.py

merge up with martin I hope... default merge base told me I was adding builtins.py ..

Show diffs side-by-side

added added

removed removed

Lines of Context:
28
28
                  'BitKeeper',
29
29
                  '.git',
30
30
                  'TAGS', '.make.state', '.sconsign', '.tmp*',
31
 
                  '.del-*']
 
31
                  '.del-*',
 
32
                  '.DS_Store',]
32
33
 
33
34
IGNORE_FILENAME = ".bzrignore"
34
35