diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-05-26 22:34:28 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-05-26 22:34:28 (GMT) |
| commit | cdddf2fe34de8e6c81fdc161711ed9adc27692c7 (patch) | |
| tree | d4820e83b49ef420d317a86e020d1f8fd54f0de7 | |
| parent | 1903a8c143273706a5bceb7a0e034a1e0f783bb7 (diff) | |
| parent | c54b502e0d4673f4250097cdc2358cac90c56ecc (diff) | |
| download | tcl-cdddf2fe34de8e6c81fdc161711ed9adc27692c7.zip tcl-cdddf2fe34de8e6c81fdc161711ed9adc27692c7.tar.gz tcl-cdddf2fe34de8e6c81fdc161711ed9adc27692c7.tar.bz2 | |
Merge 8.5
| -rw-r--r-- | .github/workflows/linux-build.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/mac-build.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/win-build.yml | 4 | ||||
| -rw-r--r-- | generic/tclDate.c | 2 | ||||
| -rw-r--r-- | generic/tclGetDate.y | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 0cbf774..d5b9c78 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -21,7 +21,7 @@ jobs: working-directory: unix steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Prepare run: | touch tclStubInit.c tclOOStubInit.c diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml index b8321f7..883c70e 100644 --- a/.github/workflows/mac-build.yml +++ b/.github/workflows/mac-build.yml @@ -11,7 +11,7 @@ jobs: working-directory: macosx steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Prepare run: | touch tclStubInit.c tclOOStubInit.c @@ -39,7 +39,7 @@ jobs: working-directory: unix steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Prepare run: | touch tclStubInit.c tclOOStubInit.c diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml index 43e2019..6ee57f9 100644 --- a/.github/workflows/win-build.yml +++ b/.github/workflows/win-build.yml @@ -21,7 +21,7 @@ jobs: # Using powershell means we need to explicitly stop on failure steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Init MSVC uses: ilammy/msvc-dev-cmd@v1 - name: Build ${{ matrix.cfgopt }} @@ -64,7 +64,7 @@ jobs: msystem: MINGW64 install: git mingw-w64-x86_64-toolchain make - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Prepare run: | touch tclStubInit.c tclOOStubInit.c diff --git a/generic/tclDate.c b/generic/tclDate.c index 23cf336..192c7b3 100644 --- a/generic/tclDate.c +++ b/generic/tclDate.c @@ -2746,7 +2746,7 @@ int TclClockOldscanObjCmd( void *dummy, /* Unused */ Tcl_Interp *interp, /* Tcl interpreter */ - int objc, /* Count of paraneters */ + int objc, /* Count of parameters */ Tcl_Obj *const *objv) /* Parameters */ { Tcl_Obj *result, *resultElement; diff --git a/generic/tclGetDate.y b/generic/tclGetDate.y index 7e26b37..412f03f 100644 --- a/generic/tclGetDate.y +++ b/generic/tclGetDate.y @@ -961,7 +961,7 @@ int TclClockOldscanObjCmd( void *dummy, /* Unused */ Tcl_Interp *interp, /* Tcl interpreter */ - int objc, /* Count of paraneters */ + int objc, /* Count of parameters */ Tcl_Obj *const *objv) /* Parameters */ { Tcl_Obj *result, *resultElement; |