Merge branch 'tizen_2.2' into tizen
authorAnas Nashif <anas.nashif@intel.com>
Mon, 16 Sep 2013 17:32:59 +0000 (13:32 -0400)
committerAnas Nashif <anas.nashif@intel.com>
Mon, 16 Sep 2013 17:32:59 +0000 (13:32 -0400)
commit383db6ea1b7108d60a79db17a8061630bc0d64a4
tree920c1270f0e3aa4536807bd4b74b073b92c4a17f
parentbf2d8f84b8efb71a294ffbec2dffa814c842b1b7
parent39cd71e9f918aa7696dda106445d203fea14ebcc
Merge branch 'tizen_2.2' into tizen

Conflicts:
CMakeLists.txt
packaging/pkgmgr-info.spec
parser/pkgmgr_parser.c
parser_path.conf.in
CMakeLists.txt
packaging/pkgmgr-info.spec
parser/pkgmgr_parser.c
parser/pkgmgr_parser.h
parser_path.conf.in