/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to tools/win32/buildout.cfg

  • Committer: John Arbash Meinel
  • Date: 2011-08-30 10:54:28 UTC
  • mfrom: (5609.48.9 2.3)
  • mto: (6015.28.2 2.4)
  • mto: This revision was merged to the branch mainline in revision 6124.
  • Revision ID: john@arbash-meinel.com-20110830105428-3xu4hkvizhfj5k11
Merge 2.3 into 2.4, and fix up the conflict for resolving bug #835035

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/win32/buildout.cfg
50
50
# on Launchpad
51
51
# bzr-release-url = http://bazaar-vcs.org/bzr/bzr.${settings:bzr-release}
52
52
bzr-release-url = lp:bzr/${settings:bzr-release}
53
 
bzr-trunk-url = http://bazaar-vcs.org/bzr/bzr.dev
 
53
bzr-trunk-url = lp:bzr
54
54
 
55
55
bzrtools-release = 1.18.0
56
56
bzrtools-release-tag = tag:release-${settings:bzrtools-release}