* .hgignore -> .gitignore
* transition to Xcode 4.x and project file to root directory
Merge commit '7eaefd98bd5293587dbbe801468da64b0ec6f4cb' into 2.3

* commit '7eaefd98bd5293587dbbe801468da64b0ec6f4cb':
  * transition to Xcode 4.x and project file to root directory
  * .hgignore -> .gitignore

Conflicts:
	Doom64EX.xcodeproj/project.pbxproj
* rev 1226 from svn://svn.code.sf.net/p/doom64ex/code/branches/2.3