Merge branch 'tizen' into mw

Signed-off-by: JuYoung Kim <j0.kim@samsung.com>

Conflicts:
	package/changelog
	package/pkginfo.manifest

4 files changed, 71 insertions, 102 deletions

diff --git a/activator/WindowActivator.cpp b/activator/WindowActivator.cpp
index 08bb7c5..1c70a30 100644
--- a/activator/WindowActivator.cpp
+++ b/activator/WindowActivator.cpp
@@ -1,39 +1,27 @@
 /*

- * Window Activator

- *

- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.

- *

- * Contact:

- *

- * Jaewon Lim <jaewon81.lim@samsung.com>

- * Juyoung Kim <j0.kim@samsung.com>

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- * 1. Redistributions of source code must retain the above copyright

- *    notice, this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above copyright

- *    notice, this list of conditions and the following disclaimer in the

- *    documentation and/or other materials provided with the distribution.

- *

- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.

- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,

- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF

- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- *

- * Contributors:

- * - S-Core Co., Ltd

- *

- */

-

-

+*   Dynamic Analyzer

+*

+* Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.

+*

+* Jaewon Lim <jaewon81.lim@samsung.com>

+* Juyoung Kim <j0.kim@samsung.com>

+* 

+* Licensed under the Apache License, Version 2.0 (the "License");

+* you may not use this file except in compliance with the License.

+* You may obtain a copy of the License at

+*

+* http://www.apache.org/licenses/LICENSE-2.0

+*

+* Unless required by applicable law or agreed to in writing, software

+* distributed under the License is distributed on an "AS IS" BASIS,

+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+* See the License for the specific language governing permissions and

+* limitations under the License.

+*

+* Contributors:

+* - S-Core Co., Ltd

+*

+*/ 

 

 /**

  * @summary

diff --git a/activator/WindowActivator.h b/activator/WindowActivator.h
index 8fce710..c50fecb 100644
--- a/activator/WindowActivator.h
+++ b/activator/WindowActivator.h
@@ -1,38 +1,27 @@
 /*

- * Window Activator

- *

- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.

- *

- * Contact:

- *

- * Jaewon Lim <jaewon91.lim@samsung.com>

- * Juyoung Kim <j0.kim@samsung.com>

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- * 1. Redistributions of source code must retain the above copyright

- *    notice, this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above copyright

- *    notice, this list of conditions and the following disclaimer in the

- *    documentation and/or other materials provided with the distribution.

- *

- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.

- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,

- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF

- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- *

- * Contributors:

- * - S-Core Co., Ltd

- *

- */

-

+*   Dynamic Analyzer

+*

+* Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.

+*

+* Jaewon Lim <jaewon81.lim@samsung.com>

+* Juyoung Kim <j0.kim@samsung.com>

+* 

+* Licensed under the Apache License, Version 2.0 (the "License");

+* you may not use this file except in compliance with the License.

+* You may obtain a copy of the License at

+*

+* http://www.apache.org/licenses/LICENSE-2.0

+*

+* Unless required by applicable law or agreed to in writing, software

+* distributed under the License is distributed on an "AS IS" BASIS,

+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+* See the License for the specific language governing permissions and

+* limitations under the License.

+*

+* Contributors:

+* - S-Core Co., Ltd

+*

+*/ 

 

 /**

  * @summary          :

diff --git a/activator/main.cpp b/activator/main.cpp
index d2b6a67..9b17af4 100644
--- a/activator/main.cpp
+++ b/activator/main.cpp
@@ -1,37 +1,27 @@
 /*
- * Window Activator
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: 
- * 
- * Changhun Lim <changhun.lim@samsung.com>
- * Gyeongmin Ju <gyeongmin.ju@samsung.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Contributors:
- * - S-Core Co., Ltd
- * 
- */
+*   Dynamic Analyzer
+*
+* Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+*
+* Jaewon Lim <jaewon81.lim@samsung.com>
+* Juyoung Kim <j0.kim@samsung.com>
+* 
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+* Contributors:
+* - S-Core Co., Ltd
+*
+*/
 
 #include <iostream>
 #include <string>
diff --git a/package/changelog b/package/changelog
index f1eb995..1b9b335 100644
--- a/package/changelog
+++ b/package/changelog
@@ -10,6 +10,8 @@ Exception Log(not error) print console -> write to file
 * 2.2.11
 - Change the method name of PlatformRootstrap
 == shihyun.kim <shihyun.kim@samsung.com> 2014-09-01
+- Applied nativecommon-eplugin's change
+== gune.kim <gune.kim@samsung.com> 2014-09-03
 * 2.2.10
 - Applied nativecommon-eplugin's change
 == gune.kim <gune.kim@samsung.com> 2014-08-22