Merge #1050, #1052, #1053, #1054 into the main trunk.

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3175 74dad513-b988-da41-8d7b-12977e46ad98

1 files changed, 25 insertions, 0 deletions

diff --git a/pjsip-apps/src/ipjsystest/Classes/TestViewController.h b/pjsip-apps/src/ipjsystest/Classes/TestViewController.h
new file mode 100644
index 00000000..e20048bf
--- /dev/null
+++ b/pjsip-apps/src/ipjsystest/Classes/TestViewController.h
@@ -0,0 +1,25 @@
+//
+//  TestViewController.h
+//  ipjsystest
+//
+//  Created by Liong Sauw Ming on 3/20/10.
+//  Copyright 2010 Teluu Inc. (http://www.teluu.com). All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+
+@interface TestViewController : UIViewController {
+    IBOutlet UITextView *testDesc;
+    IBOutlet UIButton	*button1;
+    IBOutlet UIButton	*button2;
+    
+    NSInteger key;
+}
+
+@property (nonatomic, retain) IBOutlet UITextView *testDesc;
+@property (nonatomic, retain) IBOutlet UIButton *button1;
+@property (nonatomic, retain) IBOutlet UIButton *button2;
+@property (nonatomic) NSInteger key;
+
+@end