diff options
| author | Adam Cozzette <acozzette@google.com> | 2016-11-17 17:04:30 -0800 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2016-11-17 17:04:30 -0800 |
| commit | 5d63097fc2b7f405f53d6ca4ad3c1ebd98d80ddd (patch) | |
| tree | 50d8116271f024e16334785464c794da85f3ce12 /objectivec/README.md | |
| parent | 5a76e633ea9b5adb215e93fdc11e1c0c08b3fc74 (diff) | |
| parent | cd315dcbadc02569e145bde16e3f66c2fbb08e31 (diff) | |
| download | protobuf-5d63097fc2b7f405f53d6ca4ad3c1ebd98d80ddd.tar.gz protobuf-5d63097fc2b7f405f53d6ca4ad3c1ebd98d80ddd.tar.bz2 protobuf-5d63097fc2b7f405f53d6ca4ad3c1ebd98d80ddd.zip | |
Merge branch 'master' into down-integrate-with-msvc-fix
Diffstat (limited to 'objectivec/README.md')
| -rw-r--r-- | objectivec/README.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/objectivec/README.md b/objectivec/README.md index 06118349..7226f0b9 100644 --- a/objectivec/README.md +++ b/objectivec/README.md @@ -44,7 +44,7 @@ Add `objectivec/\*.h` & `objectivec/\*.m` except for If the target is using ARC, remember to turn off ARC (`-fno-objc-arc`) for the `.m` files. -The files generated by `protoc` for the `*.proto` files (`\*.pbobjc.h' and +The files generated by `protoc` for the `*.proto` files (`\*.pbobjc.h` and `\*.pbobjc.m`) are then also added to the target. Usage |