← Back to branch summary

~gryle-devel/gryle/trunk-deleted

« back to all changes in this revision

Viewing changes to .bzrignore

  • Committer: Daniel Watkins
  • Date: 2007-01-14 00:05:03 UTC
  • mfrom: (1.1.14 gryle)
  • Revision ID: daniel@thewatkins.org.uk-20070114000503-9mmcsfwx51tcm500
Merge from Chris Lamb.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.bzrignore
1
1
.classpath
2
2
.project
3
3
bin
 
4
<<<<<<< TREE
 
5
javadoc
 
6
dist
 
7
=======
4
8
cruft
 
9
>>>>>>> MERGE-SOURCE