df688319de
travis googlemock as well
10 years ago
12a8c19167
travis fix
10 years ago
02310e73c6
Merge pull request #1 from BillyDonahue/travis
...
travis config
10 years ago
bbb54ef0ee
travis config
10 years ago
ff49eded84
Merge pull request #574 from BillyDonahue/undoc
...
Undoc
10 years ago
dcec1cede2
Merge branch 'master' into undoc
10 years ago
2e10aed6d6
Merge branch 'BillyDonahue-undoc'
10 years ago
2eb7748e70
merge
10 years ago
da25f9ee21
readme merging
10 years ago
23bd6d8a9b
readme merging
10 years ago
b55ac7f36f
readme merging
10 years ago
24ecc348b9
Merge pull request #571 from srouquette/python3
...
Fix gmock_doctor.py for Python3
10 years ago
60c85a40ff
Merge pull request #570 from Codie-Labs/master
...
xcode: project file corrected
10 years ago
ac830d6b19
Fix gmock_doctor.py for Python3
10 years ago
f5bc23fe4d
Merge pull request #1 from gregory094/master
...
xcode: project file corrected
10 years ago
8ca3ffdbb7
xcode: project file corrected
...
Project file contained the 'README' instead of 'README.md'
that's why the build failed with the fact that it can't
copy this file for its proper location.
Signed-off-by: Gergő Nagy <gergo@getcodie.com>
10 years ago
d945d8c000
fix a link
10 years ago
64d23926f9
Merge pull request #568 from lacombar/googlemock-build-dir
...
googlemock: change guess of googletest's relative location from ../gtest to ../googletest
10 years ago
eff38a7a0f
googlemock: fix unified build
10 years ago
3f4e79b999
readme merging
10 years ago
4af3c08579
readme merging
10 years ago
37b5c297cf
readme merging
10 years ago
fba825826a
Update README.md
10 years ago
ecf9459561
Merge remote-tracking branch 'google/master'
10 years ago
bf5753ac60
Update README.md
10 years ago
09fd2462ac
Update README.md
10 years ago
0b6d3b195e
Merge pull request #512 from google/unification
...
Unify googlemock into googletest
10 years ago
661699bfc0
Merge pull request #511 from BillyDonahue/unification
...
Bring GoogleMock into the GoogleTest repository
10 years ago
8a3c8c9376
tiny fix
10 years ago
5b3ef3bd6c
unified project home
10 years ago
7563fe553e
cat _home.md files into README.md
10 years ago
67f6188c8f
move ProjectHome files into root
10 years ago
ad47332a7a
Merge branch 'unification' of github.com:BillyDonahue/googlemock into unification
10 years ago
affb09edf0
move googlemock files into googlemock/ subdir
10 years ago
1f87a0970d
Move everything in googletest into googletest/googletest
10 years ago
84b8863dd9
Merge remote-tracking branch 'google/master'
10 years ago
65f381be21
Merge pull request #182 from BillyDonahue/wiki
...
move versioned docs to version directories
10 years ago
3e42adb74f
move versioned docs to version directories
10 years ago
07b2bd1f7b
Merge pull request #180 from google/wiki
...
merge wiki branch into master
10 years ago
168ab06783
Merge pull request #179 from BillyDonahue/wiki
...
Catch up with doc fixes from false-start repo
10 years ago
06fcd9ff11
readme.md updates
10 years ago
36d1a71bad
README -> README.md
10 years ago
872c422ec2
move CheatSheet.md into docs
10 years ago
3b6c87d413
Move all .md files from wiki into docs/ dir.
10 years ago
26effd4ac9
Merge branch 'wiki' of github.com:BillyDonahue/googlemock into wiki
10 years ago
c3d8269e34
Migrating wiki contents from Google Code
10 years ago
c80449247c
Merge pull request #506 from google/BillyDonahue-patch-1
...
Update README.md
10 years ago
09011c446d
Update README.md
10 years ago
dd766fb970
Merge pull request #505 from BillyDonahue/import_d
...
Import dhood
10 years ago
72d4ca6685
dhood suggestions
10 years ago
Billy Donahue
Billy Donahue
Syl
Nagy Gergő
Arnaud Lacombe
Google Code Exporter