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, 22 insertions, 0 deletions

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