diff options
| author |  yang-g <yangg@google.com> | 2015-07-06 14:05:54 -0700 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2015-07-06 14:05:54 -0700 |
| commit | 5ea46ab2482c3724fbc7fd0aab55f324fb65999c (patch) | |
| tree | 55eebc4aae8f06f931c8f75ddf84d56595f99fa1 /src/objective-c/examples/Sample | |
| parent | 3abe60b9d08ff5a784a39f7c4a10c631547c3526 (diff) | |
| parent | d426864934ac60f46e538ba81932e405fa8949b1 (diff) | |
merge with upstream and resolve conflicts
Diffstat (limited to 'src/objective-c/examples/Sample')
| -rw-r--r-- | src/objective-c/examples/Sample/Sample/ViewController.m | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/objective-c/examples/Sample/Sample/ViewController.m b/src/objective-c/examples/Sample/Sample/ViewController.m index 0011a4508d..05bd6fa2db 100644 --- a/src/objective-c/examples/Sample/Sample/ViewController.m +++ b/src/objective-c/examples/Sample/Sample/ViewController.m @@ -33,12 +33,12 @@ #import "ViewController.h" -#import <gRPC/GRPCCall.h> -#import <gRPC/GRPCMethodName.h> -#import <gRPC/GRXWriter+Immediate.h> -#import <gRPC/GRXWriteable.h> +#import <GRPCClient/GRPCCall.h> +#import <GRPCClient/GRPCMethodName.h> #import <RemoteTest/Messages.pbobjc.h> #import <RemoteTest/Test.pbrpc.h> +#import <RxLibrary/GRXWriter+Immediate.h> +#import <RxLibrary/GRXWriteable.h> @implementation ViewController |