Merge branch 'tizen_2.2' into tizen
authorAnas Nashif <anas.nashif@intel.com>
Tue, 24 Sep 2013 04:10:50 +0000 (00:10 -0400)
committerAnas Nashif <anas.nashif@intel.com>
Tue, 24 Sep 2013 04:10:50 +0000 (00:10 -0400)
commit4de501537df89cb95815d5979cd95f341b68bf08
tree68ae569544c3cd532eb168a236b3a1f163b2324c
parent3a622d957e683f025874be0b905db97641ec35f9
parent050ba4af9b8d80eae1120e7ad9c575db2c38527b
Merge branch 'tizen_2.2' into tizen

Conflicts:
packaging/ail.spec
packaging/ail.spec
src/ail_db.c
src/ail_desktop.c