 Billy Donahue
|
ff5ffd457e
|
Merge pull request #688 from tamland/python3
Python 3 support
|
2016-02-01 09:41:10 -05:00 |
|
|
Billy Donahue
|
a9b73f8139
|
Merge pull request #699 from achimnol/master
Add tmux and tmux-256color to the colored terminal list.
|
2016-01-31 16:55:53 -05:00 |
|
|
Billy Donahue
|
82b11b8cfc
|
Merge pull request #678 from pjaytycy/master
Add link to Google Test Primer docs in README.md
|
2016-01-21 14:08:55 -05:00 |
|
|
Billy Donahue
|
13206d6f53
|
Merge pull request #670 from dawikur/master
Update GTEST_PROJECT_URL_ in internal/gtest-port.h
|
2015-12-23 07:57:42 -05:00 |
|
|
Billy Donahue
|
ddb8012eb4
|
Merge pull request #602 from mtbrandy/threadcount_aix
Implement GetThreadCount for AIX.
|
2015-12-10 17:29:15 -05:00 |
|
|
Billy Donahue
|
0162ff72e8
|
Merge pull request #657 from audiofanatic/issue655-targetHeaderDeps
Add include dirs to targets if CMake version supports it
|
2015-12-10 17:28:00 -05:00 |
|
|
Billy Donahue
|
c1cd9c2b05
|
Merge pull request #650 from jpuigcerver/master
Added missing CMake install rules for GMock
|
2015-12-10 17:25:53 -05:00 |
|
|
Billy Donahue
|
57b376a9cb
|
Merge pull request #660 from waynix/FixLinks
fixed link in googlemock documentation
|
2015-12-08 10:58:04 -05:00 |
|
|
Billy Donahue
|
35fb11efbe
|
Merge pull request #654 from cmorse/doc_fix
Fix lots of broken links in documentation
|
2015-12-04 00:18:09 -05:00 |
|
|
Billy Donahue
|
1f8fe13618
|
Merge pull request #647 from mithro/patch-1
Fix AdvancedGuide link in FAQ.md
|
2015-12-02 12:35:35 -05:00 |
|
|
Billy Donahue
|
2f93e2d808
|
Merge pull request #636 from ReadmeCritic/master
Update README URLs based on HTTP redirects
|
2015-11-30 14:06:12 -05:00 |
|
|
Billy Donahue
|
6fe019e6b7
|
Merge pull request #607 from google/BillyDonahue-patch-1
Update DevGuide.md
|
2015-11-30 14:05:44 -05:00 |
|
|
Billy Donahue
|
3c3a4ac2c2
|
Merge pull request #640 from Ali-Se/patch-2
Fixing some table error in file
|
2015-11-30 14:01:33 -05:00 |
|
|
Billy Donahue
|
96bba4d5c1
|
Merge pull request #638 from KindDragon/patch-1
Update FAQ.md
|
2015-11-30 14:00:48 -05:00 |
|
|
Billy Donahue
|
ccd0f94e82
|
Merge pull request #592 from Ferenc-/master
Fix typo in googlemock/README.md
|
2015-11-30 13:49:47 -05:00 |
|
|
Billy Donahue
|
ffce1a8578
|
Merge pull request #633 from plopresti/master
Fix missing-field-initializers GCC/Clang warning (issue 433).
|
2015-11-24 13:51:39 -05:00 |
|
|
Billy Donahue
|
93c37d59b0
|
Merge pull request #632 from nocnokneo/add-cmake-install-rules
Add CMake install rules for gtest libraries and headers
|
2015-11-24 10:35:59 -05:00 |
|
|
Billy Donahue
|
884dd08d73
|
Merge pull request #628 from fjunqueira/patch-1
Adding CMakeLists.txt to the root dir
|
2015-11-24 10:35:34 -05:00 |
|
|
Billy Donahue
|
c4c23548a1
|
Merge pull request #614 from DukeXar/master
Fix C++11 clang builds in Travis CI
|
2015-11-24 10:34:13 -05:00 |
|
|
Billy Donahue
|
786564fa4a
|
Merge pull request #627 from mark-chromium/tests_msvs
Fix warnings encountered in MSVC build of gtest/gmock tests
|
2015-11-23 10:10:53 -05:00 |
|
|
Billy Donahue
|
71a26ac68b
|
Merge pull request #612 from mark-chromium/gmock_rtti
googlemock: Disable WhenDynamicCastToTest tests when RTTI is off
|
2015-11-10 17:48:26 -05:00 |
|
|
Billy Donahue
|
5bd7c2b589
|
Merge pull request #611 from mark-chromium/gmock_cxx11
googlemock: Support C++11 language with pre-C++11 library
|
2015-11-10 17:47:45 -05:00 |
|
|
Billy Donahue
|
cf517375ef
|
Merge pull request #605 from d-meiser/fix-visibility-hidden
Fix building of gtest with -fvisibility=hidden [#451]
|
2015-10-29 23:45:29 -04:00 |
|
|
Billy Donahue
|
43359642a1
|
Merge pull request #616 from anuragsoni/documentation/fix-readme-for-googletest
update googletest readme to fix broken links
|
2015-10-19 12:18:28 -04:00 |
|
|
Billy Donahue
|
554ca00ff7
|
Update DevGuide.md
stop talking about subversion in the devguide.
|
2015-10-08 09:32:40 -04:00 |
|
|
Billy Donahue
|
7f4448f40b
|
Merge pull request #604 from marco-m/urls-should-go-to-github
Fix URLs in documentation (point to github, relative links)
|
2015-10-04 12:41:40 -04:00 |
|
|
Billy Donahue
|
0dd5ef8bd4
|
Merge pull request #597 from marco-m/patch-1
Fix broken link to FrequentlyAskedQuestions
|
2015-09-23 17:58:44 -04:00 |
|
|
Billy Donahue
|
9751f4dfa4
|
Merge pull request #594 from martinmaly/gmock
Adding missing files to googlemock distribution.
|
2015-09-20 03:44:08 -04:00 |
|
|
Billy Donahue
|
c8c8f8c587
|
Merge pull request #593 from martinmaly/distcheck
Adding missing header files to the distribution.
|
2015-09-20 03:23:53 -04:00 |
|
|
Billy Donahue
|
b16fc6a69d
|
Merge pull request #591 from google/BillyDonahue-patch-1
Fix relative links in googlemock docs.
|
2015-09-17 18:24:36 -04:00 |
|
|
Billy Donahue
|
8cb0499b6a
|
Fix relative links in googlemock docs.
|
2015-09-17 18:22:40 -04:00 |
|
|
Billy Donahue
|
31eb85ee6a
|
Merge pull request #589 from nomis52/master
Fix the googlemock autotools build.
|
2015-09-17 12:26:15 -04:00 |
|
|
Billy Donahue
|
de411c3e80
|
Merge pull request #585 from orgads/warning-fix
Fix unused static variable warning on Windows
|
2015-09-09 09:19:40 -04:00 |
|
|
Billy Donahue
|
99166db754
|
Merge pull request #579 from daus-salar/patch-1
FIX add missing blank line between text and table
|
2015-09-07 21:11:47 -04:00 |
|
|
Billy Donahue
|
11ae3881eb
|
Merge pull request #582 from dmircevski/build-c++11
Add c++11 build to the Travis matrix.
|
2015-09-07 20:45:58 -04:00 |
|
|
Billy Donahue
|
f570b27e15
|
Merge pull request #578 from BillyDonahue/upstream_master
build once
|
2015-09-01 02:50:47 -04:00 |
|
|
Billy Donahue
|
d6b112ccfd
|
Merge pull request #577 from BillyDonahue/upstream_master
run tests in Travis CI
|
2015-09-01 02:46:34 -04:00 |
|
|
Billy Donahue
|
604bd64d11
|
Update README.md
|
2015-08-31 09:43:03 -04:00 |
|
|
Billy Donahue
|
7443fb92ef
|
Merge pull request #575 from BillyDonahue/master
travis continuous integration
|
2015-08-31 03:28:40 -04:00 |
|
|
Billy Donahue
|
02310e73c6
|
Merge pull request #1 from BillyDonahue/travis
travis config
|
2015-08-31 02:52:55 -04:00 |
|
|
Billy Donahue
|
ff49eded84
|
Merge pull request #574 from BillyDonahue/undoc
Undoc
|
2015-08-30 12:49:46 -04:00 |
|
|
Billy Donahue
|
24ecc348b9
|
Merge pull request #571 from srouquette/python3
Fix gmock_doctor.py for Python3
|
2015-08-30 12:09:32 -04:00 |
|
|
Billy Donahue
|
60c85a40ff
|
Merge pull request #570 from Codie-Labs/master
xcode: project file corrected
|
2015-08-30 12:06:31 -04:00 |
|
|
Billy Donahue
|
d945d8c000
|
fix a link
|
2015-08-27 10:26:17 -04:00 |
|
|
Billy Donahue
|
64d23926f9
|
Merge pull request #568 from lacombar/googlemock-build-dir
googlemock: change guess of googletest's relative location from ../gtest to ../googletest
|
2015-08-27 10:24:19 -04:00 |
|
|
Billy Donahue
|
fba825826a
|
Update README.md
|
2015-08-26 10:02:07 -04:00 |
|
|
Billy Donahue
|
bf5753ac60
|
Update README.md
|
2015-08-25 19:17:02 -04:00 |
|
|
Billy Donahue
|
09fd2462ac
|
Update README.md
|
2015-08-25 19:16:41 -04:00 |
|
|
Billy Donahue
|
0b6d3b195e
|
Merge pull request #512 from google/unification
Unify googlemock into googletest
|
2015-08-25 18:54:04 -04:00 |
|
|
Billy Donahue
|
661699bfc0
|
Merge pull request #511 from BillyDonahue/unification
Bring GoogleMock into the GoogleTest repository
|
2015-08-25 18:46:30 -04:00 |
|
|
Billy Donahue
|
65f381be21
|
Merge pull request #182 from BillyDonahue/wiki
move versioned docs to version directories
|
2015-08-25 15:44:43 -04:00 |
|
|
Billy Donahue
|
07b2bd1f7b
|
Merge pull request #180 from google/wiki
merge wiki branch into master
|
2015-08-25 13:54:31 -04:00 |
|
|
Billy Donahue
|
168ab06783
|
Merge pull request #179 from BillyDonahue/wiki
Catch up with doc fixes from false-start repo
|
2015-08-25 13:53:10 -04:00 |
|
|
Billy Donahue
|
c80449247c
|
Merge pull request #506 from google/BillyDonahue-patch-1
Update README.md
|
2015-08-24 16:35:19 -04:00 |
|
|
Billy Donahue
|
09011c446d
|
Update README.md
|
2015-08-24 16:34:07 -04:00 |
|
|
Billy Donahue
|
dd766fb970
|
Merge pull request #505 from BillyDonahue/import_d
Import dhood
|
2015-08-24 13:53:48 -04:00 |
|
|
Billy Donahue
|
6e981455c3
|
Merge pull request #7 from dhood/master
Accept dhood's readme improvement
|
2015-08-24 12:34:21 -04:00 |
|
|
Billy Donahue
|
5be21f854a
|
Merge pull request #502 from BillyDonahue/pump_manual_fix
Update PumpManual.md
|
2015-08-22 18:42:32 -04:00 |
|
|
Billy Donahue
|
c9bb347f2f
|
Merge pull request #5 from BillyDonahue/pump_manual_fix
Update PumpManual.md
|
2015-08-22 18:41:41 -04:00 |
|
|
Billy Donahue
|
0075a69b4c
|
Update PumpManual.md
|
2015-08-22 18:41:22 -04:00 |
|
|
Billy Donahue
|
3b029de086
|
Merge pull request #501 from BillyDonahue/master
integrate doc fixes
|
2015-08-22 18:38:16 -04:00 |
|
|
Billy Donahue
|
c869561d1c
|
Merge pull request #4 from BillyDonahue/samples_md-fix
relative links to samples/
|
2015-08-22 18:37:13 -04:00 |
|
|
Billy Donahue
|
f26deb26d1
|
relative links to samples/
|
2015-08-22 18:36:16 -04:00 |
|
|
Billy Donahue
|
35a6cbf3e4
|
Merge pull request #3 from google/master
Merge pull request #500 from BillyDonahue/master
|
2015-08-22 18:03:59 -04:00 |
|
|
Billy Donahue
|
35ffecabcb
|
Merge pull request #500 from BillyDonahue/master
Merge pull request #2 from google/master
|
2015-08-22 18:02:51 -04:00 |
|
|
Billy Donahue
|
a3de8e8bf7
|
Merge pull request #2 from google/master
pull from google master.
|
2015-08-22 17:58:37 -04:00 |
|
|
Billy Donahue
|
95548d3ec8
|
Merge pull request #499 from google/wiki
merge wiki branch into master
|
2015-08-22 17:39:37 -04:00 |
|
|
Billy Donahue
|
3003e787a5
|
Merge pull request #498 from BillyDonahue/wiki
Bring googlecode wiki markdown files into docs/ folder.
|
2015-08-22 17:37:27 -04:00 |
|
|
Billy Donahue
|
5050d9680b
|
Merge pull request #1 from google/master
update to google/googletest master
|
2015-08-22 17:31:23 -04:00 |
|
|
Billy Donahue
|
b45583ace0
|
Merge pull request #497 from BillyDonahue/20150822_readme_md
Rename README->README.md
|
2015-08-22 16:01:19 -04:00 |
|
|
Billy Donahue
|
849f281395
|
Merge pull request #495 from BillyDonahue/script_export
Initial sync from open_gtest_branch to github.
|
2015-08-21 15:33:25 -04:00 |
|