summaryrefslogtreecommitdiffstats
path: root/Source/kwsys
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-09-142-66/+0
| | | | | * upstream-KWSys: KWSys 2017-09-14 (d85b17e7)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-09-014-10/+82
| | | | | * upstream-KWSys: KWSys 2017-09-01 (aee0cf59)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-08-115-40/+159
| | | | | * upstream-KWSys: KWSys 2017-08-11 (e1006189)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-06-092-15/+8
| | | | | * upstream-KWSys: KWSys 2017-06-09 (a700e2ab)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-06-015-39/+37
| | | | | * upstream-KWSys: KWSys 2017-06-01 (8243fefa)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-05-314-4/+22
| | | | | * upstream-KWSys: KWSys 2017-05-31 (bd0bbad7)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-05-253-53/+75
| | | | | * upstream-KWSys: KWSys 2017-05-25 (160bed45)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-05-231-4/+5
| | | | | * upstream-KWSys: KWSys 2017-05-23 (411e958f)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-05-1620-476/+345
| | | | | * upstream-KWSys: KWSys 2017-05-16 (fe1f22ce)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-05-011-1/+11
| | | | | * upstream-KWSys: KWSys 2017-05-01 (3ec3252c)
* kwsys: match upstream changesBen Boeckel2017-04-201-7/+7
| | | | This allows the import to merge cleanly.
* kwsys: remove extra attributeBen Boeckel2017-04-201-2/+0
| | | | | This is set in `Source/.gitattributes` already and does not need to be set inside of the import.
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-04-198-188/+194
| | | | | * upstream-KWSys: KWSys 2017-04-19 (9f6ffaff)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-04-125-4/+95
| | | | | * upstream-KWSys: KWSys 2017-04-12 (23a4c211)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-03-281-2/+2
| | | | | * upstream-KWSys: KWSys 2017-03-28 (34999b6a)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-03-244-12/+14
| | | | | | | | | | | | * upstream-KWSys: KWSys 2017-03-24 (7e9f7b7b) Resolve conflicts in `.gitattributes` by integrating changes from both sides. Keep the `our-c-style` attribute that KWSys uses, but drop their definition of it in favor of ours (Git only allows custom attributes in the top level anyway). Then add our own attribute line to unset the `format.clang-format` attribute for KWSys sources since we do not want to format third-party code ourselves.
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-03-104-3/+22
| | | | | * upstream-KWSys: KWSys 2017-03-07 (5da8cfe0)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-02-142-182/+66
| | | | | * upstream-KWSys: KWSys 2017-02-14 (5c6f7836)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-02-063-1/+28
| | | | | * upstream-KWSys: KWSys 2017-02-06 (ef673998)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-01-163-7/+60
| | | | | * upstream-KWSys: KWSys 2017-01-16 (a423d829)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-12-144-29/+53
| | | | | * upstream-KWSys: KWSys 2016-12-14 (95a7e234)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-12-058-103/+198
| | | | | * upstream-KWSys: KWSys 2016-12-02 (4967ccc0)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-11-292-33/+53
| | | | | * upstream-KWSys: KWSys 2016-11-28 (1c7c2139)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-11-181-0/+11
| | | | | * upstream-KWSys: KWSys 2016-11-18 (2a3f6f6b)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-11-162-1/+8
| | | | | * upstream-KWSys: KWSys 2016-11-16 (a0c60eec)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-11-0972-13666/+11539
| | | | | * upstream-KWSys: KWSys 2016-11-09 (18c65411)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-10-251-4/+12
| | | | | * upstream-KWSys: KWSys 2016-10-23 (b630d2f5)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-10-081-11/+9
| | | | | * upstream-KWSys: KWSys 2016-10-07 (dfe9b386)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-09-291-0/+4
| | | | | * upstream-KWSys: KWSys 2016-09-29 (6cfcbede)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-09-261-16/+21
| | | | | * upstream-KWSys: KWSys 2016-09-23 (80f820fc)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-09-203-67/+175
| | | | | * upstream-KWSys: KWSys 2016-09-20 (3f69ac40)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-09-143-38/+45
| | | | | | | * upstream-KWSys: KWSys 2016-09-14 (c4049689) Issue: #16295
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-09-145-1/+1061
| | | | | * upstream-KWSys: KWSys 2016-09-14 (e736efa1)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-08-241-2/+5
| | | | | * upstream-KWSys: KWSys 2016-08-24 (8e643b9b)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-08-043-0/+73
| | | | | * upstream-KWSys: KWSys 2016-08-03 (6d23dd7e)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-08-032-12/+8
| | | | | * upstream-KWSys: KWSys 2016-08-02 (3f55579d)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-08-023-12/+29
| | | | | * upstream-KWSys: KWSys 2016-08-01 (560bcdbb)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-07-204-72/+179
| | | | | * upstream-KWSys: KWSys 2016-07-19 (9d1dbd95)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-07-192-28/+19
| | | | | * upstream-KWSys: KWSys 2016-07-18 (19732229)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-07-182-71/+166
| | | | | * upstream-KWSys: KWSys 2016-07-15 (f396bf43)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-07-013-387/+0
| | | | | * upstream-KWSys: KWSys 2016-06-30 (96f06c8e)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-03-311-2/+3
| | | | | * upstream-KWSys: KWSys 2016-03-31 (3392da1d)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-03-294-8/+8
| | | | | * upstream-KWSys: KWSys 2016-03-29 (b51abb30)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-03-093-0/+29
| | | | | * upstream-KWSys: KWSys 2016-03-09 (36d8666f)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-03-084-13/+14
| | | | | * upstream-KWSys: KWSys 2016-03-08 (6b60c184)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-02-227-17/+144
| | | | | * upstream-KWSys: KWSys 2016-02-22 (4847aedd)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-01-122-0/+11
| | | | | * upstream-KWSys: KWSys 2016-01-11 (bc07fbf7)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-01-113-19/+10
| | | | | * upstream-KWSys: KWSys 2016-01-11 (e8bf616e)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-01-072-65/+16
| | | | | * upstream-KWSys: KWSys 2016-01-07 (2418443e)
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2015-12-173-292/+1
| | | | | * upstream-KWSys: KWSys 2015-12-14 (c1149ef6)
generated by cgit v0.12 at 2024-11-09 21:30:42 (GMT)