Commit Graph

890 Commits

Author SHA1 Message Date
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
Arnaud Lacombe
eff38a7a0f googlemock: fix unified build 2015-08-26 21:50:38 -07:00
Billy Donahue
3f4e79b999 readme merging 2015-08-26 21:45:10 -04:00
Billy Donahue
4af3c08579 readme merging 2015-08-26 18:29:25 -04:00
Billy Donahue
37b5c297cf readme merging 2015-08-26 18:28:20 -04:00
Billy Donahue
fba825826a Update README.md 2015-08-26 10:02:07 -04:00
Billy Donahue
ecf9459561 Merge remote-tracking branch 'google/master' 2015-08-26 00:52:34 -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
8a3c8c9376 tiny fix 2015-08-25 18:33:08 -04:00
Billy Donahue
5b3ef3bd6c unified project home 2015-08-25 18:23:36 -04:00
Billy Donahue
7563fe553e cat _home.md files into README.md 2015-08-25 17:56:57 -04:00
Billy Donahue
67f6188c8f move ProjectHome files into root 2015-08-25 17:55:28 -04:00
Billy Donahue
ad47332a7a Merge branch 'unification' of github.com:BillyDonahue/googlemock into unification 2015-08-25 17:49:49 -04:00
Billy Donahue
affb09edf0 move googlemock files into googlemock/ subdir 2015-08-25 17:47:18 -04:00
Billy Donahue
1f87a0970d Move everything in googletest into googletest/googletest 2015-08-25 16:18:00 -04:00
Billy Donahue
84b8863dd9 Merge remote-tracking branch 'google/master' 2015-08-25 15:54:26 -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
3e42adb74f move versioned docs to version directories 2015-08-25 15:42:30 -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
06fcd9ff11 readme.md updates 2015-08-25 13:51:43 -04:00
Billy Donahue
36d1a71bad README -> README.md 2015-08-25 13:47:38 -04:00
Billy Donahue
872c422ec2 move CheatSheet.md into docs 2015-08-25 13:47:06 -04:00
Billy Donahue
3b6c87d413 Move all .md files from wiki into docs/ dir. 2015-08-25 13:32:45 -04:00
Billy Donahue
26effd4ac9 Merge branch 'wiki' of github.com:BillyDonahue/googlemock into wiki 2015-08-25 13:29:00 -04:00
Google Code Exporter
c3d8269e34 Migrating wiki contents from Google Code 2015-08-24 18:41:02 -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
72d4ca6685 dhood suggestions 2015-08-24 13:36:02 -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
Deanna Hood
7f57200362 Correct readme links 2015-08-24 14:49:37 +02: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
613e23a4bf Move wiki .md files to docs/ folder. 2015-08-22 17:35:22 -04:00
Billy Donahue
6698939b32 Merge branch 'master' into wiki 2015-08-22 17:31:55 -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
e6ad956e00 Merge branch 'wiki' of github.com:BillyDonahue/googletest into wiki 2015-08-22 17:27:48 -04:00