summaryrefslogtreecommitdiff
path: root/win
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2020-04-142-10/+20
|\
| * Merge 5.5 into 10.1bb-10.1-mergeMarko Mäkelä2020-04-012-10/+20
| |\
| | * MDEV-22032 update HeidiSQL to version 11Vladislav Vaintroub2020-03-242-10/+20
* | | Merge branch '10.1' into 10.2Oleksandr Byelkin2019-07-262-16/+13
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.1Oleksandr Byelkin2019-07-252-16/+13
| |\ \ | | |/
| | * MDEV-19922 Old version of heidisql in mariadb installerVladislav Vaintroub2019-07-052-16/+13
* | | MDEV-19889 In CMakeLists.txt, use ${CMAKE_CPACK_COMMAND},rather than just cpackVladislav Vaintroub2019-06-271-2/+2
* | | Merge 10.1 into 10.2Marko Mäkelä2019-05-135-6/+6
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-113-3/+3
| |\ \ | | |/
| | * Update FSF AddressVicențiu Ciorbaru2019-05-113-3/+3
| * | Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-112-3/+3
| |\ \ | | |/
| | * Follow-up to changing FSF addressVicențiu Ciorbaru2019-05-111-1/+1
| | * Update FSF addressMichal Schorm2019-05-102-3/+3
* | | Merge 10.1 into 10.2Marko Mäkelä2019-03-041-2/+3
|\ \ \ | |/ /
| * | Merge branch '10.0' into 10.1Oleksandr Byelkin2019-03-011-2/+3
| |\ \
| | * \ Merge branch '5.5' into 10.0Oleksandr Byelkin2019-02-281-2/+3
| | |\ \ | | | |/
| | | * MDEV-18506 MSI can't be built if MFC package is not installed with Visual StudioVladislav Vaintroub2019-02-071-2/+3
* | | | Merge 10.1 into 10.2Marko Mäkelä2019-02-031-1/+1
|\ \ \ \ | |/ / /
| * | | Merge 10.1 into 10.1Marko Mäkelä2019-02-021-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into 10.0Oleksandr Byelkin2019-01-281-1/+1
| | |\ \ | | | |/
| | | * MDEV-18254 upgrade HeidiSQL to 9.5Vladislav Vaintroub2019-01-151-1/+1
* | | | MDEV-15088 Lighter version of Windows Zip distributionsVladislav Vaintroub2018-09-181-0/+5
* | | | MDEV-15088 Lighter version of Windows Zip distributionsVladislav Vaintroub2018-09-144-1/+30
* | | | Fix 2 more VS2015 warningsVladislav Vaintroub2018-02-191-1/+1
* | | | Merge branch 'github/10.1' into 10.2Sergei Golubchik2018-02-062-0/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'github/10.0' into 10.1Sergei Golubchik2018-02-022-0/+0
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2018-01-242-0/+0
| | |\ \ | | | |/
| | | * MDEV-14446 followupVladislav Vaintroub2018-01-181-0/+0
| | | * MDEV-14446 Windows installer still uses the old brown logoVladislav Vaintroub2018-01-182-0/+0
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-10-241-1/+44
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2017-10-221-1/+44
| |\ \ \ | | |/ /
| | * | Windows MSI : dump server error log to MSI log on installation failure.Vladislav Vaintroub2017-10-031-1/+44
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-08-291-14/+0
|\ \ \ \ | |/ / /
| * | | Merge 10.0 into 10.1Marko Mäkelä2017-08-281-14/+0
| |\ \ \ | | |/ /
| | * | Remove workaround for ancient and already fixed CMake bug in MSI creation.Vladislav Vaintroub2017-08-231-14/+0
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-07-051-1/+1
|\ \ \ \ | |/ / /
| * | | MDEV-13106 : Fix check for empty directory in MSI installerVladislav Vaintroub2017-06-191-1/+1
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-061-1/+6
|\ \ \ \ | |/ / /
| * | | MDEV-9566 MariaBackup packagingVladislav Vaintroub2017-04-271-1/+6
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-04-061-5/+41
|\ \ \ \ | |/ / /
| * | | Merge 10.0 into 10.1Marko Mäkelä2017-04-061-5/+41
| |\ \ \ | | |/ /
| | * | Compiling, Windows . Avoid unnecessary rebuilds with MSVC.Vladislav Vaintroub2017-04-031-5/+41
* | | | Allow to specify C runtime library used for compilation.Vladislav Vaintroub2017-04-022-5/+9
* | | | Merge 10.2 into bb-10.2-mariarocksSergei Petrunia2017-03-314-69/+29
|\ \ \ \
| * \ \ \ Merge branch '10.1' into 10.2Sergei Golubchik2017-03-302-3/+3
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '10.0' into 10.1Sergei Golubchik2017-03-211-1/+1
| | |\ \ \ | | | |/ /
| | | * | Merge branch '5.5' into 10.0Sergei Golubchik2017-03-211-1/+1
| | | |\ \ | | | | |/
| | | | * Windows : Fix packaging when building with VS2017Vladislav Vaintroub2017-03-131-1/+1
| | * | | Correct FSF addressiangilfillan2017-03-102-3/+3
| * | | | MDEV-12328, attempt to fix windows packagingVladislav Vaintroub2017-03-261-1/+1