 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 |
|