From 00baac1a159a3a81b6b03611451c7f7f2dda4483 Mon Sep 17 00:00:00 2001 From: Jinkun Jang Date: Sat, 16 Mar 2013 01:12:09 +0900 Subject: [PATCH] merge with master --- LICENSE.APLv2 => LICENSE | 0 NOTICE => NOTICE.APLv2.0 | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename LICENSE.APLv2 => LICENSE (100%) rename NOTICE => NOTICE.APLv2.0 (64%) 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. -- 2.7.4