Skip to content

Commit 741ed49

Browse files
committed
---
yaml --- r: 193675 b: refs/heads/beta c: 425297a h: refs/heads/master i: 193673: a439a72 193671: 3a3f946 v: v3
1 parent 9efce32 commit 741ed49

File tree

145 files changed

+2714
-1533
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+2714
-1533
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
3232
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
34-
refs/heads/beta: db726faf324c9258c3e93f15d41ada4f9d008f66
34+
refs/heads/beta: 425297a93035bc89663ff5f83d229f6c19341ffb
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3737
refs/heads/tmp: de8a23bbc3a7b9cbd7574b5b91a34af59bf030e6

branches/beta/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ The Rust community congregates in a few places:
115115

116116
## Contributing
117117

118-
To contribute to Rust, please see [CONTRIBUTING.md](CONTRIBUTING.md).
118+
To contribute to Rust, please see [CONTRIBUTING](CONTRIBUTING.md).
119119

120120
Rust has an [IRC] culture and most real-time collaboration happens in a
121121
variety of channels on Mozilla's IRC network, irc.mozilla.org. The
@@ -131,4 +131,4 @@ Rust is primarily distributed under the terms of both the MIT license
131131
and the Apache License (Version 2.0), with portions covered by various
132132
BSD-like licenses.
133133
134-
See LICENSE-APACHE, LICENSE-MIT, and COPYRIGHT for details.
134+
See [LICENSE-APACHE](LICENSE-APACHE), [LICENSE-MIT](LICENSE-MIT), and [COPYRIGHT](COPYRIGHT) for details.

branches/beta/configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -701,8 +701,8 @@ probe CFG_ADB adb
701701

702702
if [ ! -z "$CFG_PANDOC" ]
703703
then
704+
# Extract "MAJOR MINOR" from Pandoc's version number
704705
PV_MAJOR_MINOR=$(pandoc --version | grep '^pandoc' |
705-
# Extract "MAJOR MINOR" from Pandoc's version number
706706
sed -E 's/pandoc(.exe)? ([0-9]+)\.([0-9]+).*/\2 \3/')
707707

708708
MIN_PV_MAJOR="1"

0 commit comments

Comments
 (0)