Octopress init
Site updated at 2014-06-11 06:23:12 UTC
Merge branch 'master' of github.com:epingwang/epingwang.github.io

Conflicts:
	assets/jwplayer/glow/controlbar/background.png
	assets/jwplayer/glow/controlbar/blankButton.png
	assets/jwplayer/glow/controlbar/divider.png
	assets/jwplayer/glow/controlbar/fullscreenButton.png
	assets/jwplayer/glow/controlbar/fullscreenButtonOver.png
	assets/jwplayer/glow/controlbar/muteButton.png
	assets/jwplayer/glow/controlbar/muteButtonOver.png
	assets/jwplayer/glow/controlbar/normalscreenButton.png
	assets/jwplayer/glow/controlbar/normalscreenButtonOver.png
	assets/jwplayer/glow/controlbar/pauseButton.png
	assets/jwplayer/glow/controlbar/pauseButtonOver.png
	assets/jwplayer/glow/controlbar/playButton.png
	assets/jwplayer/glow/controlbar/playButtonOver.png
	assets/jwplayer/glow/controlbar/timeSliderBuffer.png
	assets/jwplayer/glow/controlbar/timeSliderCapLeft.png
	assets/jwplayer/glow/controlbar/timeSliderCapRight.png
	assets/jwplayer/glow/controlbar/timeSliderProgress.png
	assets/jwplayer/glow/controlbar/timeSliderRail.png
	assets/jwplayer/glow/controlbar/unmuteButton.png
	assets/jwplayer/glow/controlbar/unmuteButtonOver.png
	assets/jwplayer/glow/display/background.png
	assets/jwplayer/glow/display/bufferIcon.png
	assets/jwplayer/glow/display/muteIcon.png
	assets/jwplayer/glow/display/playIcon.png
	assets/jwplayer/glow/dock/button.png
	assets/jwplayer/glow/glow.xml
	assets/jwplayer/glow/playlist/item.png
	assets/jwplayer/glow/playlist/itemOver.png
	assets/jwplayer/glow/playlist/sliderCapBottom.png
	assets/jwplayer/glow/playlist/sliderCapTop.png
	assets/jwplayer/glow/playlist/sliderRail.png
	assets/jwplayer/glow/playlist/sliderThumb.png
	assets/jwplayer/glow/sharing/embedIcon.png
	assets/jwplayer/glow/sharing/embedScreen.png
	assets/jwplayer/glow/sharing/shareIcon.png
	assets/jwplayer/glow/sharing/shareScreen.png
	assets/jwplayer/player.swf
	atom.xml
	blog/2014/06/10/hello-world/index.html
	blog/2014/06/10/session-202-whats-new-in-cocoa-touch-bi-ji/index.html
	blog/2014/06/10/session-216-building-adaptive-apps-with-uikit/index.html
	blog/archives/index.html
	blog/categories/ios/atom.xml
	blog/categories/ios/index.html
	blog/categories/wwdc/atom.xml
	blog/categories/wwdc/index.html
	favicon.png
	images/bird_32_gray.png
	images/bird_32_gray_fail.png
	images/code_bg.png
	images/dotted-border.png
	images/email.png
	images/line-tile.png
	images/noise.png
	images/rss.png
	images/search.png
	index.html
	javascripts/github.js
	javascripts/libs/jXHR.js
	javascripts/libs/jquery.min.js
	javascripts/libs/swfobject-dynamic.js
	javascripts/modernizr-2.0.js
	javascripts/octopress.js
	javascripts/pinboard.js
	javascripts/twitter.js
	sitemap.xml
	stylesheets/screen.css
Site updated at 2014-06-11 06:25:52 UTC