Brad King
79f30a8fc3
Merge branch 'upstream-KWSys' into update-kwsys
...
# By KWSys Upstream
* upstream-KWSys:
KWSys 2025-06-10 (d780326e)
2025-06-10 09:44:40 -04:00
Brad King
8c36c13081
Merge branch 'upstream-KWSys' into update-kwsys
...
# By KWSys Upstream
* upstream-KWSys:
KWSys 2025-01-24 (2535f5f1)
2025-01-24 09:55:57 -05:00
Brad King
5ddcaae77c
Merge branch 'upstream-KWSys' into update-kwsys
...
# By KWSys Upstream
* upstream-KWSys:
KWSys 2019-10-30 (43131a7c)
2019-10-30 09:17:30 -04:00
Brad King
81870f1159
Merge branch 'upstream-KWSys' into update-kwsys
...
* upstream-KWSys:
KWSys 2018-06-01 (8ef62b28)
2018-06-01 12:54:13 -04:00
Brad King
697a5d64d8
Merge branch 'upstream-KWSys' into update-kwsys
...
* upstream-KWSys:
KWSys 2017-04-19 (9f6ffaff)
2017-04-19 08:02:06 -04:00
Brad King
ea2a91a432
Merge branch 'upstream-KWSys' into update-kwsys
...
* 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.
2017-03-24 15:17:25 -04:00
Brad King
95a97a40e4
Merge branch 'upstream-KWSys' into update-kwsys
...
* upstream-KWSys:
KWSys 2016-11-09 (18c65411)
2016-11-09 09:23:18 -05:00
Brad King
c5cc3441b3
Merge branch 'upstream-kwsys' into update-kwsys
2015-09-02 10:23:17 -04:00
Brad King
f4fcfc6ef3
Merge branch 'upstream-kwsys' into update-kwsys
2013-12-20 14:27:36 -05:00
Brad King
f668112039
Merge branch 'upstream-kwsys' into update-kwsys
2013-11-25 11:19:42 -05:00
Brad King