Merge branch 'tizen_2.2' into tizen
authorAnas Nashif <anas.nashif@intel.com>
Wed, 25 Sep 2013 04:06:55 +0000 (00:06 -0400)
committerAnas Nashif <anas.nashif@intel.com>
Wed, 25 Sep 2013 04:07:03 +0000 (00:07 -0400)
commitbe15473201938a1b740344bfae69b81871923414
tree999335cfd68c726c645783c23fa83f59ae7e5764
parent291571d4cf5ea9f6cfa21baf04a5878b3cfc6f23
parent76fb8007bb8fe5a98fb29df6f8750767704de38e
Merge branch 'tizen_2.2' into tizen

Change-Id: I745d702d4a083a733deafe8a91aef219da9fcf8e
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
alarm-lib.c
packaging/alarm-manager.spec