giomfo 3c309c5c5c Merge remote-tracking branch 'origin/develop' into with-contacts ... Conflicts: samples/matrixConsole/matrixConsole/ViewController/SettingsViewController.m		2015-01-27 10:29:34 +01:00
..
API	1 - add MatrixSDKHandler::createPrivateOneToOneRoomWith	2015-01-27 10:15:26 +01:00
Assets	-> Check if any contact contains a matrix email	2015-01-20 16:29:42 +01:00
Base.lproj	Merge remote-tracking branch 'origin/develop' into with-contacts	2015-01-27 10:29:34 +01:00
External	Do not embed external codes in the project. CocoaPods is our friend for that.	2015-01-14 11:52:51 +01:00
Images.xcassets	Rename directories of sample sources (matrixConsole)	2014-11-24 10:38:23 +01:00
Model	-> the contacts list are sectioned in 2 lists	2015-01-26 18:06:13 +01:00
View	Merge remote-tracking branch 'origin/develop' into with-contacts	2015-01-27 10:29:34 +01:00
ViewController	Merge remote-tracking branch 'origin/develop' into with-contacts	2015-01-27 10:29:34 +01:00
AppDelegate.h	Renaming:	2015-01-23 13:46:27 +01:00
AppDelegate.m	-> the contacts list are sectioned in 2 lists	2015-01-26 18:06:13 +01:00
AppSettings.h	-> the contacts list are sectioned in 2 lists	2015-01-26 18:06:13 +01:00
AppSettings.m	-> the contacts list are sectioned in 2 lists	2015-01-26 18:06:13 +01:00
Info.plist	Prepare 0.2.1 release	2015-01-14 13:26:49 +01:00
main.m	Rename directories of sample sources (matrixConsole)	2014-11-24 10:38:23 +01:00
matrixConsole-Defaults.plist	SIOS-20 : the left participants are not displayed by default (must be enabled in the device settings)	2014-12-17 14:40:39 +01:00