Skip to content

Commit 40693b0

Browse files
committed
---
yaml --- r: 189438 b: refs/heads/master c: cfea8ec h: refs/heads/master v: v3
1 parent bdd2e9d commit 40693b0

File tree

115 files changed

+1298
-736
lines changed

Some content is hidden

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

115 files changed

+1298
-736
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 0f6a0b58f9dbc3a741abd898f2d06a8ba78a938d
2+
refs/heads/master: cfea8ec41699e25c8fb524d625190f0cb860dc71
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 270a677d4d698916f5ad103f0afc3c070b8dbeb4
55
refs/heads/try: 649d35e4d830b27806705dc5352c86ab6d6fd1a1

trunk/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.

trunk/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)