Merge branch 'master' into dev

This commit is contained in:
Zeex 2018-08-13 05:20:36 +06:00
commit 2f04b12acd
2 changed files with 28 additions and 27 deletions

View File

@ -1,36 +1,37 @@
<!-- pawn-lang compiler issue template -->
<!--
This area is for:
- Bug reports
- Feature suggestions
- Questions directly regarding the compiler's implementation, command arguments
or usage. This is NOT a place to ask questions about compiler errors or
warnings you are getting UNLESS those errors or warnings are unexpected and
the result of a possible bug.
For any other questions, post on the SA:MP forum or the unofficial SA:MP
Discord server in the #programming channel.
The issues section of this repository is managed by @Southclaws who will assign
labels etc.
Please ensure that your issue is directly related to the pawn-lang/compiler. Issues
seeking help with scripting or doubts about SA-MP are not relevant to this project.
-->
**Is this a BUG REPORT, FEATURE REQUEST or QUESTION?**:
### Issue description:
<!--
Information that could be useful:
- how to reproduce the problem
- observed behavior
- expected behavior
- other relevant information
-->
* [ ] Bug Report
* [ ] Feature Request
* [ ] Question
### Minimal complete verifiable example (MCVE):
<!--
Please provide a minimal complete verifiable code which compiles
and reproduces the problem. If the compiler is showing undefined (random) behavior,
provide the code which invokes such behavior.
**What happened**:
Learn more about writing MCVE from [StackOverflow](https://stackoverflow.com/help/mcve).
**What you expected to happen**:
If this section is not relevant, feel free to remove this section from your issue.
-->
**How to reproduce it (as minimally and precisely as possible)**:
```
```
**Anything else we need to know?**:
<!-- comments on the code, if any -->
**Environment**:
### Workspace Information:
* Operating System
* Compiler version
* How are you invoking the compiler? Pawno, Sublime, vscode, sampctl or command-line?
* If using sampctl, the version number
* Compiler version:
* Command line arguments provided (or sampctl version):
* Operating System:

View File

@ -5,7 +5,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake)
set(VERSION_MAJOR 3)
set(VERSION_MINOR 10)
set(VERSION_BUILD 7)
set(VERSION_BUILD 8)
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD})
set(VERSION_STR ${VERSION})
math(EXPR VERSION_INT "${VERSION_MAJOR} << 8 | ${VERSION_MINOR}")