CMake.git - CMake is a cross-platform, open-source build system generator.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'upstream-KWSys' into update-kwsys	Brad King	2017-04-19	1	-2/+2
\| \| \| \| \|	* upstream-KWSys: KWSys 2017-04-19 (9f6ffaff)
*	Merge branch 'upstream-KWSys' into update-kwsys	Brad King	2017-03-28	1	-2/+2
\| \| \| \| \|	* upstream-KWSys: KWSys 2017-03-28 (34999b6a)
*	Merge branch 'upstream-KWSys' into update-kwsys	Brad King	2017-03-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	* 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-kwsys	Brad King	2016-11-09	1	-220/+208
\| \| \| \| \|	* upstream-KWSys: KWSys 2016-11-09 (18c65411)
*	Merge branch 'upstream-KWSys' into update-kwsys	Brad King	2016-07-20	1	-70/+164
\| \| \| \| \|	* upstream-KWSys: KWSys 2016-07-19 (9d1dbd95)
*	Merge branch 'upstream-kwsys' into update-kwsys	Brad King	2015-09-02	1	-3/+3
\|
*	Merge branch 'upstream-kwsys' into update-kwsys	Brad King	2015-01-21	1	-2/+8
\|
*	Merge branch 'upstream-kwsys' into update-kwsys	Brad King	2014-03-04	1	-3/+18
\|
*	Merge branch 'upstream-kwsys' into update-kwsys	Brad King	2013-12-23	1	-2/+3
\|
*	Merge branch 'upstream-kwsys' into update-kwsys	Brad King	2013-12-19	1	-1/+1
\|
*	Merge branch 'upstream-kwsys' into update-kwsys	Brad King	2013-11-25	1	-0/+172