Merge branch 'tizen_2.0'
authorKim Gibyoung <lastkgb.kim@samsung.com>
Wed, 23 Jan 2013 05:31:32 +0000 (14:31 +0900)
committerKim Gibyoung <lastkgb.kim@samsung.com>
Wed, 23 Jan 2013 06:03:46 +0000 (15:03 +0900)
commit6c76c69f3f6ff885fa08bf89e97164cb6545ad35
tree8250f1f3abeceec7c18573d88541387e58db90eb
parent3ad6bc9c46ea7ea82201429ba14a83238de7ff34
parent1bb744080b4e6a24df02043323934f845ff8a9a3
Merge branch 'tizen_2.0'
Copy p2p_supplicant License file at correct location

Change-Id: I4b527d170739d6e73528d7fc5557c37b16068008
packaging/wifi-direct-manager.spec
plugin/wpasupplicant/src/wifi-direct-plugin.c