diff options
| author | Filip Strömbäck <filip.stromback@liu.se> | 2020-03-18 10:17:15 +0100 |
|---|---|---|
| committer | Filip Strömbäck <filip.stromback@liu.se> | 2020-03-18 10:17:15 +0100 |
| commit | 4be5b82aa9c40e428d5dc2149dae001627ab0146 (patch) | |
| tree | 1da345eddf0ada9d64ea142e1154c801c63fa95b /src | |
| parent | 3551fc0c3c9dbe5fbe1fed6a2a978cc861c2f77b (diff) | |
| parent | 6bfd609f12a270b8c98844741836db2dc1c9e694 (diff) | |
| download | pintos-rs-4be5b82aa9c40e428d5dc2149dae001627ab0146.tar.gz | |
Merge branch 'master' into 'master'
Fixed typo in standalone lab3, ptree -> pstree
See merge request klaar36/pintos!12
Diffstat (limited to 'src')
| -rw-r--r-- | src/standalone/upg3/fork-wait.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/standalone/upg3/fork-wait.c b/src/standalone/upg3/fork-wait.c index 2e7729d..8ef4c07 100644 --- a/src/standalone/upg3/fork-wait.c +++ b/src/standalone/upg3/fork-wait.c @@ -18,7 +18,7 @@ int main(int argc, char* argv[]) } printf("P | Switch to a differen terminal.\n" - "P | Execute the command \"ptree $USER\".\n" + "P | Execute the command \"pstree $USER\".\n" "P | It will show a list of processes you are running.\n" "P | You should see the process '%s' once.\n" "P | Press enter when you verified that.\n\n", argv[0]); |