← Back to branch summary

~gryle-devel/gryle/trunk-deleted

« back to all changes in this revision

Viewing changes to .bzrignore

  • Committer: Richard Warburton
  • Date: 2007-01-13 23:52:29 UTC
  • mfrom: (1.1.14 gryle)
  • mto: (1.1.24 gryle)
  • mto: This revision was merged to the branch mainline in revision 19.
  • Revision ID: richard.warburton@gmail.com-20070113235229-bw5zlkpz70f3bku6
 

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