reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-12-14 23:29:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
36,319 Commits 4 Branches 185 Tags 113 MiB
7ba27e364f
Commit Graph

2745 Commits

Author SHA1 Message Date
Brad King
594a9fcf6f Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-06-01 (8243fefa)
 2017-06-01 14:07:35 -04:00
Brad King
5e9bd8a2ea Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-05-31 (bd0bbad7)
 2017-05-31 09:11:14 -04:00
Brad King
867b17428a Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-05-25 (160bed45)
 2017-05-25 09:40:59 -04:00
Brad King
6f3341591d Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-05-23 (411e958f)
 2017-05-23 14:34:26 -04:00
Brad King
16ebd9f615 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-05-16 (fe1f22ce)
 2017-05-16 11:39:01 -04:00
Brad King
750d58bf61 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-05-01 (3ec3252c)
 2017-05-01 10:25:35 -04:00
Ben Boeckel
d88a511da3 kwsys: match upstream changes 
This allows the import to merge cleanly.
 2017-04-20 15:35:39 -04:00
Ben Boeckel
e832c32ca8 kwsys: remove extra attribute 
This is set in `Source/.gitattributes` already and does not need to be
set inside of the import.
 2017-04-20 12:53:33 -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
ada8e0cac4 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-04-12 (23a4c211)
 2017-04-12 09:10:22 -04:00
Brad King
cdd2875ad2 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-03-28 (34999b6a)
 2017-03-28 10:18:10 -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
83be64d99c Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-03-07 (5da8cfe0)
 2017-03-10 16:24:53 -05:00
Brad King
ff843dbd54 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-02-14 (5c6f7836)
 2017-02-14 09:22:07 -05:00
Brad King
c2645e1979 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-02-06 (ef673998)
 2017-02-06 13:01:40 -05:00
Brad King
ee77941a1f Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-01-16 (a423d829)
 2017-01-16 14:06:29 -05:00
Brad King
da03e2d6c6 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-12-14 (95a7e234)
 2016-12-14 11:19:03 -05:00
Brad King
7f307d9ea6 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-12-02 (4967ccc0)
 2016-12-05 09:55:34 -05:00
Brad King
8bced8b18d Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-11-28 (1c7c2139)
 2016-11-29 11:49:34 -05:00
Brad King
4775a99f61 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-11-18 (2a3f6f6b)
 2016-11-18 09:13:40 -05:00
Brad King
451e9f93be Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-11-16 (a0c60eec)
 2016-11-16 13:27:07 -05: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
51cfba8c21 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-10-23 (b630d2f5)
 2016-10-25 09:13:48 -04:00
Brad King
c22f3cf715 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-10-07 (dfe9b386)
 2016-10-08 05:25:35 -04:00
Brad King
6fe45e989d Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-09-29 (6cfcbede)
 2016-09-29 10:56:37 -04:00
Brad King
1798e49595 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-09-23 (80f820fc)
 2016-09-26 09:45:51 -04:00
Brad King
3876e2976e Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-09-20 (3f69ac40)
 2016-09-20 09:04:14 -04:00
Brad King
04d94fbe92 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-09-14 (c4049689)

Issue: #16295
 2016-09-14 09:49:37 -04:00
Brad King
e4fc770fa3 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-09-14 (e736efa1)
 2016-09-14 09:41:55 -04:00
Brad King
7bc6dccc0a Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-08-24 (8e643b9b)
 2016-08-24 10:55:19 -04:00
Brad King
8abca14034 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-08-03 (6d23dd7e)
 2016-08-04 10:11:07 -04:00
Brad King
b602cb85c9 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-08-02 (3f55579d)
 2016-08-03 10:10:28 -04:00
Brad King
35995fa6b5 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-08-01 (560bcdbb)
 2016-08-02 09:21:52 -04:00
Brad King
51d9e8ae3e Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-07-19 (9d1dbd95)
 2016-07-20 09:05:17 -04:00
Brad King
788bb14664 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-07-18 (19732229)
 2016-07-19 08:27:19 -04:00
Brad King
03407040d4 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-07-15 (f396bf43)
 2016-07-18 09:28:42 -04:00
Brad King
aec1d43f5d Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-06-30 (96f06c8e)
 2016-07-01 09:13:38 -04:00
Brad King
168e44e202 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-03-31 (3392da1d)
 2016-03-31 08:46:50 -04:00
Brad King
dc333a7115 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-03-29 (b51abb30)
 2016-03-29 14:29:42 -04:00
Brad King
fd466fe657 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-03-09 (36d8666f)
 2016-03-09 09:10:55 -05:00
Brad King
ea04ec09d8 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-03-08 (6b60c184)
 2016-03-08 09:29:23 -05:00
Brad King
d010ba9fa7 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-02-22 (4847aedd)
 2016-02-22 09:03:40 -05:00
Brad King
33cafa68b8 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-01-11 (bc07fbf7)
 2016-01-12 10:55:49 -05:00
Brad King
9821924d45 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-01-11 (e8bf616e)
 2016-01-11 11:20:14 -05:00
Brad King
0a5ce85f60 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-01-07 (2418443e)
 2016-01-07 13:13:51 -05:00
Brad King
38c31ed5f5 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2015-12-14 (c1149ef6)
 2015-12-17 14:46:12 -05:00
Brad King
c025e61ad4 Merge branch 'upstream-kwsys' into update-kwsys 2015-12-10 09:33:14 -05:00
Brad King
306e2016bb Merge branch 'upstream-kwsys' into update-kwsys 2015-12-04 09:59:04 -05:00
Brad King
fe05ad9752 Merge branch 'upstream-kwsys' into update-kwsys 2015-12-01 08:46:55 -05:00
Brad King
c6d75294b2 Merge branch 'upstream-kwsys' into update-kwsys 2015-10-19 09:16:32 -04:00