Merge branch 'master' into simulator.
authorG S Senthil Kumar <senthil.gs@samsung.com>
Fri, 18 Dec 2015 10:21:44 +0000 (15:51 +0530)
committerG S Senthil Kumar <senthil.gs@samsung.com>
Fri, 18 Dec 2015 10:30:35 +0000 (16:00 +0530)
commitb6000d631514604bb6f6ccc30e0ee00003fda8d1
tree68b687cdb7af4b43e69b70e1b919e296d224317e
parentb9ec115c802fd90dd47b7c40685353c26bfeade7
parenta261f91511655cd0cd406c3059ad6e97090f2dfd
Merge branch 'master' into simulator.

Change-Id: Ib0054018e0b27b9eb84ac8bb4dd7955c98ec731a
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
service/simulator/java/eclipse-plugin/ClientControllerPlugin/.classpath
service/simulator/java/eclipse-plugin/ClientControllerPlugin/.project
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/manager/ResourceManager.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/.classpath
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/CreateResourceWizard.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/StartStopResourcePage.java