branch 생성

사운드매니저 관련 이 브랜치에서 다룰 예정
soundmanager 작성중
.
SoundManager E.N.D.!
lib added
newline at end of file
Merge remote-tracking branch 'origin/Gunhee'

Conflicts:
	NNGameFramework/NNGameFramework/Debug/AnimationSample.obj
	NNGameFramework/NNGameFramework/Debug/BirdHunter.lastbuildstate
	NNGameFramework/NNGameFramework/Debug/CL.read.1.tlog
	NNGameFramework/NNGameFramework/Debug/CL.write.1.tlog
	NNGameFramework/NNGameFramework/Debug/CameraSample.obj
	NNGameFramework/NNGameFramework/Debug/FMODSoundSample.obj
	NNGameFramework/NNGameFramework/Debug/Main.obj
	NNGameFramework/NNGameFramework/Debug/NNAnimation.obj
	NNGameFramework/NNGameFramework/Debug/NNApplication.obj
	NNGameFramework/NNGameFramework/Debug/NNAudioSystem.obj
	NNGameFramework/NNGameFramework/Debug/NNBird.obj
	NNGameFramework/NNGameFramework/Debug/NNBirdBulletHitEffect.obj
	NNGameFramework/NNGameFramework/Debug/NNBirdFactory.obj
	NNGameFramework/NNGameFramework/Debug/NNBullet.obj
	NNGameFramework/NNGameFramework/Debug/NNBulletManager.obj
	NNGameFramework/NNGameFramework/Debug/NNCamera.obj
	NNGameFramework/NNGameFramework/Debug/NND2DRenderer.obj
	NNGameFramework/NNGameFramework/Debug/NNEffectManager.obj
	NNGameFramework/NNGameFramework/Debug/NNGameFramework.log
	NNGameFramework/NNGameFramework/Debug/NNGameScene.obj
	NNGameFramework/NNGameFramework/Debug/NNHitEffect.obj
	NNGameFramework/NNGameFramework/Debug/NNInputSystem.obj
	NNGameFramework/NNGameFramework/Debug/NNLabel.obj
	NNGameFramework/NNGameFramework/Debug/NNMap.obj
	NNGameFramework/NNGameFramework/Debug/NNMapManager.obj
	NNGameFramework/NNGameFramework/Debug/NNObject.obj
	NNGameFramework/NNGameFramework/Debug/NNPlayerCharacter.obj
	NNGameFramework/NNGameFramework/Debug/NNPoint.obj
	NNGameFramework/NNGameFramework/Debug/NNPoo.obj
	NNGameFramework/NNGameFramework/Debug/NNPooBulletHitEffect.obj
	NNGameFramework/NNGameFramework/Debug/NNPooManager.obj
	NNGameFramework/NNGameFramework/Debug/NNResourceManager.obj
	NNGameFramework/NNGameFramework/Debug/NNScene.obj
	NNGameFramework/NNGameFramework/Debug/NNSceneDirector.obj
	NNGameFramework/NNGameFramework/Debug/NNSize.obj
	NNGameFramework/NNGameFramework/Debug/NNSound.obj
	NNGameFramework/NNGameFramework/Debug/NNSprite.obj
	NNGameFramework/NNGameFramework/Debug/NNSpriteAtlas.obj
	NNGameFramework/NNGameFramework/Debug/NNSpriteNode.obj
	NNGameFramework/NNGameFramework/Debug/NNTexture.obj
	NNGameFramework/NNGameFramework/Debug/NNXML.obj
	NNGameFramework/NNGameFramework/Debug/SpriteAtlasSample.obj
	NNGameFramework/NNGameFramework/Debug/SpriteSample.obj
	NNGameFramework/NNGameFramework/Debug/XMLSample.obj
	NNGameFramework/NNGameFramework/Debug/action_store.obj
	NNGameFramework/NNGameFramework/Debug/cl.command.1.tlog
	NNGameFramework/NNGameFramework/Debug/htmlutil.obj
	NNGameFramework/NNGameFramework/Debug/lex_util.obj
	NNGameFramework/NNGameFramework/Debug/link.command.1.tlog
	NNGameFramework/NNGameFramework/Debug/link.read.1.tlog
	NNGameFramework/NNGameFramework/Debug/link.write.1.tlog
	NNGameFramework/NNGameFramework/Debug/node_set.obj
	NNGameFramework/NNGameFramework/Debug/rc.command.1.tlog
	NNGameFramework/NNGameFramework/Debug/rc.read.1.tlog
	NNGameFramework/NNGameFramework/Debug/rc.write.1.tlog
	NNGameFramework/NNGameFramework/Debug/tinystr.obj
	NNGameFramework/NNGameFramework/Debug/tinyxml.obj
	NNGameFramework/NNGameFramework/Debug/tinyxmlerror.obj
	NNGameFramework/NNGameFramework/Debug/tinyxmlparser.obj
	NNGameFramework/NNGameFramework/Debug/tokenlist.obj
	NNGameFramework/NNGameFramework/Debug/vc110.idb
	NNGameFramework/NNGameFramework/Debug/vc110.pdb
	NNGameFramework/NNGameFramework/Debug/xml_util.obj
	NNGameFramework/NNGameFramework/Debug/xpath_expression.obj
	NNGameFramework/NNGameFramework/Debug/xpath_processor.obj
	NNGameFramework/NNGameFramework/Debug/xpath_stack.obj
	NNGameFramework/NNGameFramework/Debug/xpath_static.obj
	NNGameFramework/NNGameFramework/Debug/xpath_stream.obj
	NNGameFramework/NNGameFramework/Debug/xpath_syntax.obj
	NNGameFramework/NNGameFramework/NNGameFramework.vcxproj
	NNGameFramework/NNGameFramework/NNGameFramework.vcxproj.filters