force commit
force commit
Merge branch 'master' of https://github.com/fvi-att/MocPlanManga2014

Conflicts:
	.project
Merge branch 'master' of https://github.com/fvi-att/MocPlanManga2014

# By = (6) and others
# Via = (3) and others
* 'master' of https://github.com/fvi-att/MocPlanManga2014:
  add gitignore
  imply appicon and splash
  add .gitignore for .project
  Tuwb_©ç̉æʑJÚ
  change character_image
  sub header modified
  remove file already not need
  Remove Comment Lines
  topæʂ̃CAEgAeLXgύX
  4R}̍쐬ª̑Iðæʂ̏úo[W
  commit force
Merge branch 'master' of https://github.com/fvi-att/MocPlanManga2014

# By 神保 直幸 (3) and = (2)
# Via =
* 'master' of https://github.com/fvi-att/MocPlanManga2014:
  add *.log for .gitignore
  top layout design modify
  top layout design modify
  top layout design merge
  name fix and make folder
Merge branch 'master' of https://github.com/fvi-att/MocPlanManga2014

# By = (5) and others
# Via = (4) and others
* 'master' of https://github.com/fvi-att/MocPlanManga2014:
  all merge
  replace var uiconfig @commonPart and unify to global module var
  forcecommit I will add it to gitignore :)
  commit sasatomo change at CNW.js
  remove log file
  EditPicture and AddNewManga
  header,footer export
  test

Conflicts:
	tiapp.xml
force commit
force commit and add gitignore correctly
force merge
remove old data and imply jnb 8kaa's merge
Added confirmation window
merge all file from yanis
commit all
add /Resources/.gitignore