summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch '11.7' into 'master'11.7B Stack2021-03-03
|\ | | | | | | | | add upstream 11.7 See merge request opensource-tracking/FreeFileSync!31
| * add upstream 11.7B Stack2021-03-02
|/
* Merge branch '11.6' into 'master'11.6B Stack2021-02-02
|\ | | | | | | | | add upstream 11.6 See merge request opensource-tracking/FreeFileSync!30
| * add upstream 11.6B Stack2021-02-02
|/
* Merge branch '11.5' into 'master'11.5B Stack2021-01-04
|\ | | | | | | | | add upstream 11.5 See merge request opensource-tracking/FreeFileSync!29
| * add upstream 11.5B Stack2021-01-04
|/
* Merge branch '11.4' into 'master'11.4B Stack2020-12-08
|\ | | | | | | | | add upstream 11.4 See merge request opensource-tracking/FreeFileSync!28
| * add upstream 11.4B Stack2020-12-08
|/
* Merge branch '11.3' into 'master'11.3B Stack2020-11-02
|\ | | | | | | | | add upstream 11.3 See merge request opensource-tracking/FreeFileSync!27
| * add upstream 11.3B Stack2020-11-01
|/
* Merge branch '11.2' into 'master'11.2B Stack2020-10-03
|\ | | | | | | | | add upstream 11.2 See merge request opensource-tracking/FreeFileSync!26
| * add upstream 11.2B Stack2020-10-02
|/
* Merge branch '11.1' into 'master'11.1B Stack2020-09-01
|\ | | | | | | | | add upstream 11.1 See merge request opensource-tracking/FreeFileSync!25
| * add upstream 11.1B Stack2020-08-31
|/
* Merge branch '11.0' into 'master'11.0B Stack2020-07-22
|\ | | | | | | | | add upstream 11.0 See merge request opensource-tracking/FreeFileSync!24
| * add upstream 11.0B Stack2020-07-22
|/
* Merge branch '10.25' into 'master'10.25B Stack2020-06-20
|\ | | | | | | | | add upstream 10.25 See merge request opensource-tracking/FreeFileSync!23
| * add upstream 10.25B Stack2020-06-19
|/
* Merge branch '10.24' into 'master'10.24B Stack2020-05-18
|\ | | | | | | | | include fixes after forum t=7276 See merge request opensource-tracking/FreeFileSync!22
| * include fixes after forum t=7276B Stack2020-05-17
| | | | | | | | https://freefilesync.org/forum/viewtopic.php?t=7276#p24407
* | Merge branch '10.24' into 'master'B Stack2020-05-17
|\| | | | | | | | | add upstream 10.24 See merge request opensource-tracking/FreeFileSync!21
| * add upstream 10.24B Stack2020-05-17
|/
* Merge branch '10.23' into 'master'10.23B Stack2020-04-18
|\ | | | | | | | | add upstream 10.23 See merge request opensource-tracking/FreeFileSync!20
| * add upstream 10.23B Stack2020-04-18
|/
* Merge branch '10.22' into 'master'10.22Daniel Wilhelm2020-03-20
|\ | | | | | | | | add upstream 10.22 See merge request opensource-tracking/FreeFileSync!19
| * add upstream 10.22B Stack2020-03-18
| |
* | Merge branch '10.21' into 'master'10.21Daniel Wilhelm2020-03-20
|\| | | | | | | | | add upstream 10.21 See merge request opensource-tracking/FreeFileSync!18
| * add upstream 10.21B Stack2020-03-18
|/
* Merge branch '10.20' into 'master'10.20Daniel Wilhelm2020-02-23
|\ | | | | | | | | add upstream 10.20 See merge request opensource-tracking/FreeFileSync!17
| * remove upstream deleted filesDaniel Wilhelm2020-02-23
| |
| * update from upstream to fix missing includesB Stack2020-02-15
| |
| * add upstream 10.20B Stack2020-02-15
|/ | | | | It is worth noting that the send email feature is not present in the GPL release.
* Merge branch '10.19' into 'master'10.19Daniel Wilhelm2019-12-30
|\ | | | | | | | | add upstream 10.19 See merge request opensource-tracking/FreeFileSync!16
| * add upstream 10.19B Stack2019-12-27
|/
* Merge branch '10.18' into 'master'10.18Daniel Wilhelm2019-12-14
|\ | | | | | | | | add upstream 10.18 See merge request opensource-tracking/FreeFileSync!15
| * add upstream 10.18B Stack2019-11-20
|/
* Merge branch '10.17' into 'master'10.17Daniel Wilhelm2019-10-28
|\ | | | | | | | | 10.17 See merge request opensource-tracking/FreeFileSync!14
| * add upstream 10.17B Stack2019-10-17
|/
* Merge branch '10.16' into 'master'10.16Daniel Wilhelm2019-10-04
|\ | | | | | | | | add upstream 10.16 See merge request opensource-tracking/FreeFileSync!13
| * update bugs.txt after re-release from upstreamB Stack2019-09-18
| | | | | | | | https://freefilesync.org/forum/viewtopic.php?t=6628
| * add upstream 10.16B Stack2019-09-17
| |
* | Merge branch '10.15' into 'master'10.15B Stack2019-09-03
|\| | | | | | | | | add upstream 10.15 See merge request opensource-tracking/FreeFileSync!12
| * add upstream 10.15B Stack2019-08-15
|/
* Merge branch '10.14' into 'master'10.14B Stack2019-07-28
|\ | | | | | | | | 10.14 See merge request opensource-tracking/FreeFileSync!11
| * Add open_ssl.cpp to CPP_FILES in MakefileB Stack2019-07-15
| | | | | | | | https://freefilesync.org/forum/viewtopic.php?f=8&t=6486&p=21314#p21321
| * add zen/open_ssl.cpp from upstreamB Stack2019-07-15
| | | | | | | | | | Upstream added this file which was a hard dependency that should be bundled. See https://freefilesync.org/forum/viewtopic.php?t=6486.
| * add upstream 10.14B Stack2019-07-15
|/
* Merge branch '10.13' into 'master'10.13B Stack2019-07-10
|\ | | | | | | | | 10.13 See merge request opensource-tracking/FreeFileSync!10
| * 10.13B Stack2019-06-14
|/
* Merge branch '10.12' into 'master'10.12Daniel Wilhelm2019-05-12
|\ | | | | | | | | 10.12 See merge request opensource-tracking/FreeFileSync!9
bgstack15