Skip to content

Commit 939c9e6

Browse files
stevetranbystevetranby
committed
Merge commit '18a6d8241d9a1290bfd6341ea6159877906d780a' into scgamex-v3
* commit '18a6d8241d9a1290bfd6341ea6159877906d780a': update Copyright. might need manual fix later (cocos2d#18659) # Conflicts: # cocos/audio/include/SimpleAudioEngine.h # cocos/audio/ios/SimpleAudioEngine.mm # cocos/audio/linux/SimpleAudioEngine.cpp # cocos/audio/mac/SimpleAudioEngine.mm # cocos/audio/tizen/SimpleAudioEngineTizen.cpp # cocos/audio/win32/SimpleAudioEngine.cpp # cocos/audio/winrt/SimpleAudioEngine.cpp
2 parents fbd5b1c + 18a6d82 commit 939c9e6

File tree

2,375 files changed

+17185
-1520
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,375 files changed

+17185
-1520
lines changed

‎cocos/2d/CCAction.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
Copyright (c) 2008-2010 Ricardo Quesada
33
Copyright (c) 2010-2012 cocos2d-x.org
44
Copyright (c) 2011 Zynga Inc.
5-
Copyright (c) 2013-2017 Chukong Technologies Inc.
5+
Copyright (c) 2013-2016 Chukong Technologies Inc.
6+
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
67
78
http://www.cocos2d-x.org
89

‎cocos/2d/CCAction.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
Copyright (c) 2008-2010 Ricardo Quesada
33
Copyright (c) 2010-2012 cocos2d-x.org
44
Copyright (c) 2011 Zynga Inc.
5-
Copyright (c) 2013-2017 Chukong Technologies Inc.
5+
Copyright (c) 2013-2016 Chukong Technologies Inc.
6+
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
67
78
http://www.cocos2d-x.org
89

‎cocos/2d/CCActionCamera.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
Copyright (c) 2008-2010 Ricardo Quesada
33
Copyright (c) 2010-2012 cocos2d-x.org
44
Copyright (c) 2011 Zynga Inc.
5-
Copyright (c) 2013-2017 Chukong Technologies Inc.
5+
Copyright (c) 2013-2016 Chukong Technologies Inc.
6+
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
67
78
http://www.cocos2d-x.org
89

‎cocos/2d/CCActionCamera.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
Copyright (c) 2008-2010 Ricardo Quesada
33
Copyright (c) 2010-2012 cocos2d-x.org
44
Copyright (c) 2011 Zynga Inc.
5-
Copyright (c) 2013-2017 Chukong Technologies Inc.
5+
Copyright (c) 2013-2016 Chukong Technologies Inc.
6+
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
67
78
http://www.cocos2d-x.org
89

‎cocos/2d/CCActionCatmullRom.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
* Copyright (c) 2008 Radu Gruian
33
* Copyright (c) 2011 Vit Valentin
44
* Copyright (c) 2012 cocos2d-x.org
5-
* Copyright (c) 2013-2017 Chukong Technologies Inc.
5+
* Copyright (c) 2013-2016 Chukong Technologies Inc.
6+
* Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
67
*
78
* Permission is hereby granted, free of charge, to any person obtaining a copy
89
* of this software and associated documentation files (the "Software"), to deal

‎cocos/2d/CCActionCatmullRom.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
* Copyright (c) 2008 Radu Gruian
33
* Copyright (c) 2011 Vit Valentin
44
* Copyright (c) 2012 cocos2d-x.org
5-
* Copyright (c) 2013-2017 Chukong Technologies Inc.
5+
* Copyright (c) 2013-2016 Chukong Technologies Inc.
6+
* Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
67
*
78
*
89
* Permission is hereby granted, free of charge, to any person obtaining a copy

‎cocos/2d/CCActionEase.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/****************************************************************************
22
Copyright (c) 2008-2009 Jason Booth
33
Copyright (c) 2010-2012 cocos2d-x.org
4-
Copyright (c) 2013-2017 Chukong Technologies Inc.
4+
Copyright (c) 2013-2016 Chukong Technologies Inc.
5+
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
56
67
http://www.cocos2d-x.org
78

‎cocos/2d/CCActionEase.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/****************************************************************************
22
Copyright (c) 2008-2009 Jason Booth
33
Copyright (c) 2010-2012 cocos2d-x.org
4-
Copyright (c) 2013-2017 Chukong Technologies Inc.
4+
Copyright (c) 2013-2016 Chukong Technologies Inc.
5+
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
56
67
http://www.cocos2d-x.org
78

‎cocos/2d/CCActionGrid.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/****************************************************************************
22
Copyright (c) 2009 On-Core
33
Copyright (c) 2010-2012 cocos2d-x.org
4-
Copyright (c) 2013-2017 Chukong Technologies Inc.
4+
Copyright (c) 2013-2016 Chukong Technologies Inc.
5+
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
56
67
http://www.cocos2d-x.org
78

‎cocos/2d/CCActionGrid.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/****************************************************************************
22
Copyright (c) 2009 On-Core
33
Copyright (c) 2010-2012 cocos2d-x.org
4-
Copyright (c) 2013-2017 Chukong Technologies Inc.
4+
Copyright (c) 2013-2016 Chukong Technologies Inc.
5+
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
56
67
http://www.cocos2d-x.org
78

0 commit comments

Comments
 (0)