~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Vincent Ladeuil
  • Date: 2010-10-08 10:50:51 UTC
  • mfrom: (5050.17.31 2.2.2-dev)
  • mto: This revision was merged to the branch mainline in revision 5474.
  • Revision ID: v.ladeuil+lp@free.fr-20101008105051-xd4knkrohzclffic
Merge 2.2 into trunk including fixes for bug #651706 and bug #646133

Show diffs side-by-side

added added

removed removed

Lines of Context:
66
66
            'package_data': {'bzrlib': ['doc/api/*.txt',
67
67
                                        'tests/test_patches_data/*',
68
68
                                        'help_topics/en/*.txt',
 
69
                                        'tests/ssl_certs/ca.crt',
69
70
                                        'tests/ssl_certs/server_without_pass.key',
70
71
                                        'tests/ssl_certs/server_with_pass.key',
71
72
                                        'tests/ssl_certs/server.crt'