adding filetypes to .gitignore file
Merge remote branch 'upstream/master'
updated for iPhone 3GS and 4 support. Also turned instance methods into
class methods.
Merge remote-tracking branch 'upstream/master'
Adds iPhone 4S and iPhone 4 CDMA support.

Also renamed IPHONE_4G_NAMESTRING -> IPHONE_4S_NAMESTRING
platformTypeString now returns more helpful string for unknown hardware
Adds support for iPad 2
Merge branch 'master' of github.com:freespace/uidevice-extension

Conflicts:
	UIDevice-hardware.m
iphone 4S
Added support for simulator, iPad1, iPad2, iPad3, iPod3, iPod4
Update data
Return iPhone 4S instead of iPhone 5.
Add newline at end of files.
fix memory bug
modern
Merge remote-tracking branch 'upstream/master'
warning fix
gitignore
warnings
fix