avr/qmk/googletest - [no description]

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of github.com:google/googletest	Gennadiy Civil	2018-04-05	1	-1/+1
\|\
\| *	Merge pull request #1545 from gennadiycivil/master	Gennadiy Civil	2018-04-04	3	-70/+487
\| \|\ \| \| \| \| \| \|	merging gmock matchers 1
\| \| *	Merge branch 'master' into master	Gennadiy Civil	2018-04-04	1	-1/+1
\| \| \|\ \| \| \|/ \| \|/\|
\| * \|	Merge pull request #1543 from fo40225/fix_locale_win	Gennadiy Civil	2018-04-04	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \|	fix build break on locale windows
\| \| * \	Merge branch 'master' into fix_locale_win	Gennadiy Civil	2018-04-04	1	-1/+3
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	fix build break on locale windows	fo40225	2018-04-04	1	-1/+1
\| \| \| \|
* \| \| \|	Merging matchers test	Gennadiy Civil	2018-04-05	1	-40/+779
\| \|_\|/ \|/\| \|
* \| \|	bad cut/paste	Gennadiy Civil	2018-04-04	1	-1/+1
\| \| \|
* \| \|	More on MSVC warning C4503, decorated name length exceeded	Gennadiy Civil	2018-04-04	1	-2/+6
\| \| \|
* \| \|	More on MSVC warning C4503, decorated name length exceeded	Gennadiy Civil	2018-04-04	1	-1/+1
\| \| \|
* \| \|	Address MSVC warning C4503, decorated name length exceeded, name was truncated	Gennadiy Civil	2018-04-04	1	-0/+2
\| \| \|
* \| \|	Fixing build break on MSVC	Gennadiy Civil	2018-04-04	1	-1/+1
\| \| \|
* \| \|	Merge branch 'master' of github.com:google/googletest	Gennadiy Civil	2018-04-04	0	-0/+0
\|\\| \|
\| * \|	Merge pull request #1542 from gennadiycivil/master	Gennadiy Civil	2018-04-04	1	-1/+3
\| \|\ \ \| \| \|/ \| \|/\|	Tweaking #1523 to exclude nacl, cl 191591810
* \| \|	merging gmock matchers 1	Gennadiy Civil	2018-04-04	3	-72/+483
\| \|/ \|/\|
* \|	Tweaking https://github.com/google/googletest/pull/1523 to exclude nacl	Gennadiy Civil	2018-04-04	1	-1/+3
\|/
*	Merge pull request #1523 from leissa/int3	Gennadiy Civil	2018-04-04	1	-0/+3
\|\ \| \| \| \|	provide alternative for DebugBreak()
\| *	Merge branch 'master' into int3	Gennadiy Civil	2018-04-03	1	-1/+1
\| \|\ \| \|/ \|/\|
* \|	Merge pull request #1541 from gennadiycivil/master	Gennadiy Civil	2018-04-03	1	-1/+1
\|\ \ \| \| \| \| \| \|	Upstream, 191344765
\| * \	Merge branch 'master' of github.com:google/googletest	Gennadiy Civil	2018-04-03	0	-0/+0
\| \|\ \ \| \|/ / \|/\| \|
\| * \|	Upstreaming, cl 191344765	Gennadiy Civil	2018-04-03	1	-1/+1
\| \| \|
\| \| *	Merge branch 'master' into int3	Gennadiy Civil	2018-04-03	1	-19/+5
\| \| \|\ \| \|_\|/ \|/\| \|
* \| \|	Merge pull request #1539 from gennadiycivil/master	Gennadiy Civil	2018-04-03	1	-19/+5
\|\\| \| \| \| \| \| \| \|	merging port, continue
\| * \|	merging port, cont. 191443078	Gennadiy Civil	2018-04-03	1	-3/+5
\| \| \|
\| * \|	Merge branch 'master' of github.com:google/googletest	Gennadiy Civil	2018-04-03	0	-0/+0
\| \|\ \ \| \|/ / \|/\| \|
\| * \|	merging, cont - 2	Gennadiy Civil	2018-04-03	1	-16/+0
\| \| \|
\| \| *	Merge branch 'master' into int3	Gennadiy Civil	2018-04-03	1	-10/+22
\| \| \|\ \| \|_\|/ \|/\| \|
* \| \|	Merge pull request #1538 from gennadiycivil/master	Gennadiy Civil	2018-04-03	1	-4/+7
\|\\| \| \| \| \| \| \| \|	merging , cont
\| * \|	Merge branch 'master' of github.com:google/googletest	Gennadiy Civil	2018-04-03	0	-0/+0
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	Merge pull request #1537 from gennadiycivil/master	Gennadiy Civil	2018-04-03	1	-1/+6
\|\ \ \ \| \| \| \| \| \| \| \|	gtest-port.h merge
\| \| * \|	merging gtest-port.h , 191439094	Gennadiy Civil	2018-04-03	1	-4/+7
\| \|/ /
\| * \|	merging, just comments format	Gennadiy Civil	2018-04-03	1	-1/+3
\| \| \|
\| * \|	testing, merge	Gennadiy Civil	2018-04-03	1	-1/+1
\| \| \|
\| * \|	Merge branch 'master' of github.com:google/googletest	Gennadiy Civil	2018-04-03	0	-0/+0
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	Merge pull request #1534 from gennadiycivil/master	Gennadiy Civil	2018-04-02	1	-5/+9
\|\ \ \ \| \| \| \| \| \| \| \|	merging gtest-port.h, again - 1
\| \| * \|	Testing, gtest-port.h merge	Gennadiy Civil	2018-04-03	1	-0/+3
\| \|/ /
\| * /	merging gtest-port.h, again - 1	Gennadiy Civil	2018-04-02	1	-5/+9
\|/ /
\| *	Merge branch 'master' into int3	Roland Leißa	2018-03-30	2	-25/+46
\| \|\ \| \|/ \|/\|
* \|	Include OSX builds back into PR builds	Gennadiy Civil	2018-03-29	1	-2/+0
\| \| \| \| \| \|	Had an instance where the breakage was not detected until the actual merge. Need to be better than that
* \|	Merge pull request #1527 from google/revert-1518-master	Gennadiy Civil	2018-03-29	1	-14/+9
\|\ \ \| \| \| \| \| \|	Revert "merging gtest-port 1 of N"
\| * \|	Revert "merging gtest-port 1 of N"	Gennadiy Civil	2018-03-29	1	-14/+9
\|/ /
* \|	Merge pull request #1526 from google/revert-1525-master	Gennadiy Civil	2018-03-29	1	-9/+37
\|\ \ \| \| \| \| \| \|	Revert "merging gtest-port, 2"
\| * \|	Revert "merging gtest-port, 2"	Gennadiy Civil	2018-03-29	1	-9/+37
\|/ /
\| *	Merge remote-tracking branch 'google/master' into int3	Roland Leißa	2018-03-29	1	-37/+9
\| \|\ \| \|/ \|/\|
* \|	Merge pull request #1525 from gennadiycivil/master	Gennadiy Civil	2018-03-29	1	-37/+9
\|\ \ \| \| \| \| \| \|	merging gtest-port, 2
\| * \|	merging gtest-port, 2	Gennadiy Civil	2018-03-29	1	-37/+9
\|/ /
\| *	typo	Roland Leißa	2018-03-29	1	-1/+1
\| \|
\| *	provide alternative for DebugBreak()	Roland Leißa	2018-03-28	1	-0/+3
\|/ \| \| \|	This uses asm("int3") for clang/gcc on x86 as alternative for DebugBreak()
*	Merge pull request #1518 from gennadiycivil/master	Gennadiy Civil	2018-03-27	1	-9/+14
\|\ \| \| \| \|	merging gtest-port 1 of N
\| *	merging gtest-port 1 of N	Gennadiy Civil	2018-03-27	1	-9/+14
\|/