Merge branch 'master' into release-1.0 55/1955/1 release-1.0
authorShawn O. Pearce <sop@google.com>
Thu, 6 Nov 2008 16:32:37 +0000 (08:32 -0800)
committerShawn O. Pearce <sop@google.com>
Thu, 6 Nov 2008 16:34:42 +0000 (08:34 -0800)
commitbcf40054e1c69a9439d771090222efecda747c88
tree79c99ce450e4debfc6a50ed78b17a4cb40fc3bd7
parent8b2cdbed47386a920ed1d302006319330d31b270
parentecca0c759dfa9e605036a33141cd450684c69cea
Merge branch 'master' into release-1.0

* master:
  Remove now-defunct <snapshot> entries from the manifest
  Remove hardcoded branch constant

Conflicts:
default.xml
default.xml