0000000000000000000000000000000000000000 df3a63927f0b20436afc33b4105f5cef97d5c74c Arthur Wang <arthraim@gmail.com> 1422094225 +0800	clone: from git@git.oschina.net:arthurwang/the42sons.git
df3a63927f0b20436afc33b4105f5cef97d5c74c df3a63927f0b20436afc33b4105f5cef97d5c74c Arthur Wang <arthraim@gmail.com> 1422094836 +0800	checkout: moving from master to develop-arthur
df3a63927f0b20436afc33b4105f5cef97d5c74c cc8d6f46880e04af2fa6a8a76e94f76479930748 Arthur Wang <arthriam@gmail.com> 1422103218 +0800	commit: add my work
cc8d6f46880e04af2fa6a8a76e94f76479930748 5765ee9dfce18c85c2b23d975e9a210c16cbab54 Arthur Wang <arthraim@gmail.com> 1422103433 +0800	checkout: moving from develop-arthur to develop-lionel
5765ee9dfce18c85c2b23d975e9a210c16cbab54 cc8d6f46880e04af2fa6a8a76e94f76479930748 Arthur Wang <arthraim@gmail.com> 1422103443 +0800	checkout: moving from develop-lionel to develop-arthur
cc8d6f46880e04af2fa6a8a76e94f76479930748 5765ee9dfce18c85c2b23d975e9a210c16cbab54 Arthur Wang <arthraim@gmail.com> 1422103456 +0800	rebase: checkout develop-lionel
5765ee9dfce18c85c2b23d975e9a210c16cbab54 187ddba8247e3a2f0218c618e9240fd30d5e5921 Arthur Wang <arthraim@gmail.com> 1422103458 +0800	rebase: add my work
187ddba8247e3a2f0218c618e9240fd30d5e5921 187ddba8247e3a2f0218c618e9240fd30d5e5921 Arthur Wang <arthraim@gmail.com> 1422103458 +0800	rebase finished: returning to refs/heads/develop-arthur
187ddba8247e3a2f0218c618e9240fd30d5e5921 abb1be58307e0114f3c425f9e866243e2b0c3e23 Arthur Wang <arthraim@gmail.com> 1422110605 +0800	commit: generate players by wechat API
abb1be58307e0114f3c425f9e866243e2b0c3e23 b2891d79dc37a63df4028b52a8c8630b6845f5f6 Arthur Wang <arthraim@gmail.com> 1422111725 +0800	commit: generate hero by weibo info too
b2891d79dc37a63df4028b52a8c8630b6845f5f6 5765ee9dfce18c85c2b23d975e9a210c16cbab54 Arthur Wang <arthraim@gmail.com> 1422112225 +0800	checkout: moving from develop-arthur to develop-lionel
5765ee9dfce18c85c2b23d975e9a210c16cbab54 db3675db095cf8589fe306c00865ed3bd172a370 Arthur Wang <arthraim@gmail.com> 1422112225 +0800	rebase: checkout origin/develop-lionel
db3675db095cf8589fe306c00865ed3bd172a370 db3675db095cf8589fe306c00865ed3bd172a370 Arthur Wang <arthraim@gmail.com> 1422112226 +0800	rebase finished: returning to refs/heads/develop-lionel
db3675db095cf8589fe306c00865ed3bd172a370 df3a63927f0b20436afc33b4105f5cef97d5c74c Arthur Wang <arthraim@gmail.com> 1422112226 +0800	checkout: moving from develop-lionel to master
df3a63927f0b20436afc33b4105f5cef97d5c74c db3675db095cf8589fe306c00865ed3bd172a370 Arthur Wang <arthraim@gmail.com> 1422112226 +0800	rebase: checkout origin/master
db3675db095cf8589fe306c00865ed3bd172a370 db3675db095cf8589fe306c00865ed3bd172a370 Arthur Wang <arthraim@gmail.com> 1422112226 +0800	rebase finished: returning to refs/heads/master
db3675db095cf8589fe306c00865ed3bd172a370 b2891d79dc37a63df4028b52a8c8630b6845f5f6 Arthur Wang <arthraim@gmail.com> 1422112226 +0800	checkout: moving from master to develop-arthur
db3675db095cf8589fe306c00865ed3bd172a370 94ca251d0a6199c88a16874c6a3199e0cba3dfd6 Arthur Wang <arthraim@gmail.com> 1422115465 +0800	commit: add assets
94ca251d0a6199c88a16874c6a3199e0cba3dfd6 78cc57d9e4dba4e71a2e9f1b98511dc0947cacce Arthur Wang <arthraim@gmail.com> 1422117696 +0800	commit: tweaks
78cc57d9e4dba4e71a2e9f1b98511dc0947cacce db3675db095cf8589fe306c00865ed3bd172a370 Arthur Wang <arthraim@gmail.com> 1422117712 +0800	checkout: moving from develop-arthur to master
db3675db095cf8589fe306c00865ed3bd172a370 baaa0227f561e91e0edb80aa21f4d5ee5ddaf389 Arthur Wang <arthraim@gmail.com> 1422117728 +0800	pull origin master: Fast-forward
baaa0227f561e91e0edb80aa21f4d5ee5ddaf389 78cc57d9e4dba4e71a2e9f1b98511dc0947cacce Arthur Wang <arthraim@gmail.com> 1422117742 +0800	checkout: moving from master to develop-arthur
78cc57d9e4dba4e71a2e9f1b98511dc0947cacce baaa0227f561e91e0edb80aa21f4d5ee5ddaf389 Arthur Wang <arthraim@gmail.com> 1422117746 +0800	rebase: checkout master
baaa0227f561e91e0edb80aa21f4d5ee5ddaf389 e63917267976f9d98809d8a803bee457c47bd2f2 Arthur Wang <arthraim@gmail.com> 1422117748 +0800	rebase: add assets
e63917267976f9d98809d8a803bee457c47bd2f2 6598db19beaff4790aed858cb0ed72ac95a59626 Arthur Wang <arthraim@gmail.com> 1422117749 +0800	rebase: tweaks
6598db19beaff4790aed858cb0ed72ac95a59626 6598db19beaff4790aed858cb0ed72ac95a59626 Arthur Wang <arthraim@gmail.com> 1422117750 +0800	rebase finished: returning to refs/heads/develop-arthur
6598db19beaff4790aed858cb0ed72ac95a59626 cfdb6973497e280baabf2110dd252ff8c555bc32 Arthur Wang <arthraim@gmail.com> 1422117907 +0800	commit: fix
cfdb6973497e280baabf2110dd252ff8c555bc32 79e081e9654d4babf8527735fe4b938aa45a4a53 Arthur Wang <arthraim@gmail.com> 1422118498 +0800	commit: fix
79e081e9654d4babf8527735fe4b938aa45a4a53 baaa0227f561e91e0edb80aa21f4d5ee5ddaf389 Arthur Wang <arthraim@gmail.com> 1422118511 +0800	checkout: moving from develop-arthur to master
baaa0227f561e91e0edb80aa21f4d5ee5ddaf389 6e39eb340e3d403a8896c4e0ce8f054031f67303 Arthur Wang <arthraim@gmail.com> 1422118525 +0800	pull -t origin master: Fast-forward
6e39eb340e3d403a8896c4e0ce8f054031f67303 79e081e9654d4babf8527735fe4b938aa45a4a53 Arthur Wang <arthraim@gmail.com> 1422118537 +0800	checkout: moving from master to develop-arthur
79e081e9654d4babf8527735fe4b938aa45a4a53 4c149b0e52d6a99573f8c739a4e81cd669809386 Arthur Wang <arthraim@gmail.com> 1422118552 +0800	merge master: Merge made by the 'recursive' strategy.
4c149b0e52d6a99573f8c739a4e81cd669809386 6e39eb340e3d403a8896c4e0ce8f054031f67303 Arthur Wang <arthraim@gmail.com> 1422125118 +0800	checkout: moving from develop-arthur to master
6e39eb340e3d403a8896c4e0ce8f054031f67303 f55b3c8cd63b6b145a5165ad354204b522c9e185 Arthur Wang <arthraim@gmail.com> 1422125134 +0800	pull origin master: Fast-forward
f55b3c8cd63b6b145a5165ad354204b522c9e185 4c149b0e52d6a99573f8c739a4e81cd669809386 Arthur Wang <arthraim@gmail.com> 1422125139 +0800	checkout: moving from master to develop-arthur
4c149b0e52d6a99573f8c739a4e81cd669809386 6afa28614ddb114f85113f6829b5185c8f3cf9bd Arthur Wang <arthraim@gmail.com> 1422125182 +0800	commit (merge): Merge branch 'master' into develop-arthur
6afa28614ddb114f85113f6829b5185c8f3cf9bd f55b3c8cd63b6b145a5165ad354204b522c9e185 Arthur Wang <arthraim@gmail.com> 1422126478 +0800	checkout: moving from develop-arthur to master
f55b3c8cd63b6b145a5165ad354204b522c9e185 3ad5a59afcd51a0b9e317acba3c4a57b859768f3 Arthur Wang <arthraim@gmail.com> 1422126487 +0800	pull: Fast-forward
3ad5a59afcd51a0b9e317acba3c4a57b859768f3 6afa28614ddb114f85113f6829b5185c8f3cf9bd Arthur Wang <arthraim@gmail.com> 1422126496 +0800	checkout: moving from master to develop-arthur
6afa28614ddb114f85113f6829b5185c8f3cf9bd 3ad5a59afcd51a0b9e317acba3c4a57b859768f3 Arthur Wang <arthraim@gmail.com> 1422126504 +0800	checkout: moving from develop-arthur to master
3ad5a59afcd51a0b9e317acba3c4a57b859768f3 6afa28614ddb114f85113f6829b5185c8f3cf9bd Arthur Wang <arthraim@gmail.com> 1422126551 +0800	checkout: moving from master to develop-arthur
6afa28614ddb114f85113f6829b5185c8f3cf9bd 3ad5a59afcd51a0b9e317acba3c4a57b859768f3 Arthur Wang <arthraim@gmail.com> 1422126555 +0800	checkout: moving from develop-arthur to master
3ad5a59afcd51a0b9e317acba3c4a57b859768f3 6afa28614ddb114f85113f6829b5185c8f3cf9bd Arthur Wang <arthraim@gmail.com> 1422126561 +0800	checkout: moving from master to develop-arthur
6afa28614ddb114f85113f6829b5185c8f3cf9bd 5b61dce6dfdb1b79e11380a21f3adac55797d25a Arthur Wang <arthraim@gmail.com> 1422126564 +0800	merge master: Merge made by the 'recursive' strategy.
5b61dce6dfdb1b79e11380a21f3adac55797d25a cba7474d2de7e58021df8f4d91f34c0937d59c29 Arthur Wang <arthraim@gmail.com> 1422127812 +0800	commit: queueing
cba7474d2de7e58021df8f4d91f34c0937d59c29 5b61dce6dfdb1b79e11380a21f3adac55797d25a Arthur Wang <arthraim@gmail.com> 1422127869 +0800	checkout: moving from develop-arthur to feature-queueing
5b61dce6dfdb1b79e11380a21f3adac55797d25a cba7474d2de7e58021df8f4d91f34c0937d59c29 Arthur Wang <arthraim@gmail.com> 1422127884 +0800	pull origin feature-queueing: Fast-forward
cba7474d2de7e58021df8f4d91f34c0937d59c29 3ad5a59afcd51a0b9e317acba3c4a57b859768f3 Arthur Wang <arthraim@gmail.com> 1422127899 +0800	checkout: moving from feature-queueing to master
3ad5a59afcd51a0b9e317acba3c4a57b859768f3 ee71fad4de2a7af79b6d1fe3f18d07efce1afe1c Arthur Wang <arthraim@gmail.com> 1422127910 +0800	pull origin master: Fast-forward
ee71fad4de2a7af79b6d1fe3f18d07efce1afe1c 4c149b0e52d6a99573f8c739a4e81cd669809386 Arthur Wang <arthraim@gmail.com> 1422127940 +0800	checkout: moving from master to develop-arthur
4c149b0e52d6a99573f8c739a4e81cd669809386 47c5315b04f1b333589abb38e9f8e2d710e5d08e Arthur Wang <arthraim@gmail.com> 1422128022 +0800	commit (merge): Merge branch 'master' into develop-arthur
47c5315b04f1b333589abb38e9f8e2d710e5d08e c791b5c02804aff25946f1ecde4d1a901ae9615a Arthur Wang <arthraim@gmail.com> 1422129958 +0800	commit: flip
c791b5c02804aff25946f1ecde4d1a901ae9615a ee71fad4de2a7af79b6d1fe3f18d07efce1afe1c Arthur Wang <arthraim@gmail.com> 1422129977 +0800	checkout: moving from develop-arthur to master
ee71fad4de2a7af79b6d1fe3f18d07efce1afe1c c791b5c02804aff25946f1ecde4d1a901ae9615a Arthur Wang <arthraim@gmail.com> 1422130020 +0800	checkout: moving from master to develop-arthur
c791b5c02804aff25946f1ecde4d1a901ae9615a ee71fad4de2a7af79b6d1fe3f18d07efce1afe1c Arthur Wang <arthraim@gmail.com> 1422130026 +0800	rebase: checkout master
ee71fad4de2a7af79b6d1fe3f18d07efce1afe1c 066f5415f10a854e37b0fc2f5fadd39ad06e7b17 Arthur Wang <arthraim@gmail.com> 1422130029 +0800	rebase: add assets
066f5415f10a854e37b0fc2f5fadd39ad06e7b17 c791b5c02804aff25946f1ecde4d1a901ae9615a Arthur Wang <arthraim@gmail.com> 1422130041 +0800	rebase: aborting
c791b5c02804aff25946f1ecde4d1a901ae9615a ee71fad4de2a7af79b6d1fe3f18d07efce1afe1c Arthur Wang <arthraim@gmail.com> 1422130055 +0800	checkout: moving from develop-arthur to master
ee71fad4de2a7af79b6d1fe3f18d07efce1afe1c c791b5c02804aff25946f1ecde4d1a901ae9615a Arthur Wang <arthraim@gmail.com> 1422130059 +0800	merge develop-arthur: Fast-forward
c791b5c02804aff25946f1ecde4d1a901ae9615a c791b5c02804aff25946f1ecde4d1a901ae9615a Arthur Wang <arthraim@gmail.com> 1422130081 +0800	checkout: moving from master to develop-arthur
c791b5c02804aff25946f1ecde4d1a901ae9615a 685fb0940dc4ed7f2fa88594317274e014c43a8f Arthur Wang <arthraim@gmail.com> 1422131017 +0800	pull origin master: Fast-forward
685fb0940dc4ed7f2fa88594317274e014c43a8f c791b5c02804aff25946f1ecde4d1a901ae9615a Arthur Wang <arthraim@gmail.com> 1422131484 +0800	checkout: moving from develop-arthur to master
c791b5c02804aff25946f1ecde4d1a901ae9615a 685fb0940dc4ed7f2fa88594317274e014c43a8f Arthur Wang <arthraim@gmail.com> 1422131509 +0800	pull origin master: Fast-forward
685fb0940dc4ed7f2fa88594317274e014c43a8f 7371015b4b58bae427304126d5737887bc476ae3 Arthur Wang <arthraim@gmail.com> 1422131544 +0800	commit: switch images
7371015b4b58bae427304126d5737887bc476ae3 b32c56e53b3e1f21ba5ac2a95e66fa68734f5e8b Arthur Wang <arthraim@gmail.com> 1422161397 +0800	pull origin master: Fast-forward
b32c56e53b3e1f21ba5ac2a95e66fa68734f5e8b bf13fc4ef975ce10440366972ba6a79b20a77302 Arthur Wang <arthraim@gmail.com> 1422161458 +0800	commit: random players
bf13fc4ef975ce10440366972ba6a79b20a77302 bf13fc4ef975ce10440366972ba6a79b20a77302 Arthur Wang <arthraim@gmail.com> 1422168978 +0800	checkout: moving from master to master
bf13fc4ef975ce10440366972ba6a79b20a77302 bf13fc4ef975ce10440366972ba6a79b20a77302 Arthur Wang <arthraim@gmail.com> 1422168986 +0800	checkout: moving from master to master
bf13fc4ef975ce10440366972ba6a79b20a77302 603d2e05048b4dea597a0cba2a1401a1b68020f9 Arthur Wang <arthraim@gmail.com> 1422169227 +0800	pull: Fast-forward
603d2e05048b4dea597a0cba2a1401a1b68020f9 ee2573159f0ce06abc55f51218348c04ddfd70fb Arthur Wang <arthraim@gmail.com> 1422169289 +0800	pull: Fast-forward
