From: Jinkun Jang <jinkun.jang@samsung.com>
Date: Fri, 15 Mar 2013 16:12:09 +0000 (+0900)
Subject: merge with master
X-Git-Tag: 2.1b_release~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=00baac1a159a3a81b6b03611451c7f7f2dda4483;p=framework%2Fapi%2Fserial.git

merge with master
---

diff --git a/LICENSE.APLv2 b/LICENSE
similarity index 100%
rename from LICENSE.APLv2
rename to LICENSE
diff --git a/NOTICE b/NOTICE.APLv2.0
similarity index 64%
rename from NOTICE
rename to NOTICE.APLv2.0
index 0e0f016..ccdad52 100644
--- a/NOTICE
+++ b/NOTICE.APLv2.0
@@ -1,3 +1,3 @@
 Copyright (c) Samsung Electronics Co., Ltd. All rights reserved.
 Except as noted, this software is licensed under Apache License, Version 2.
-Please, see the LICENSE.APLv2 file for Apache License terms and conditions.
+Please, see the LICENSE file for Apache License terms and conditions.