LikeFeed/.gitignore, branch master Sphnx project, AngelHack Boston 2012.06.23 Merge branch 'master' of github.com:teddywing/LikeFeed 2012-06-30T20:36:01+00:00 Anqi Xu 2012-06-30T20:36:01+00:00 aeec38e371ad32d60e741cc8d1456b5666dc0ef0 Conflicts: build.log 
Conflicts:
	build.log
* .gitignore: explicitly added .DS_Store 2012-06-24T03:22:02+00:00 Teddy Wing 2012-06-24T03:22:02+00:00 123cbfc4681aa5aa40198673c140f8b051f73c01 * removed .DS_Store from repo 
* removed .DS_Store from repo
Initial Titanium base project, Ti SDK v1.6.2 2012-06-23T19:58:20+00:00 Teddy Wing 2012-06-23T19:58:20+00:00 38f22380eb69129c2dcc89a6bf68ed56573b086a