Permalink
Browse files

Merge http://github.com/fredjean/TouchXML

* http://github.com/fredjean/TouchXML:
  Replaced the space based indentation back to a tab to match the rest of the code.
  Fixed a compiler warning in CXMLNamespaceNode.m. Added Emacs backup files to the .gitignore file.

Conflicts:
	.gitignore
  • Loading branch information...
2 parents 1707fb8 + 7731bc2 commit 38a804320562a40741a9c144cf8824b39d7e6148 Jonathan Wight committed Oct 19, 2010
Showing with 2 additions and 1 deletion.
  1. +1 −0 .gitignore
  2. +1 −1 Source/CXMLNamespaceNode.m
View
1 .gitignore
@@ -1,3 +1,4 @@
+*~
# xcode noise
build/
*.pbxuser
View
2 Source/CXMLNamespaceNode.m
@@ -12,7 +12,7 @@ @implementation CXMLNamespaceNode
- (id) initWithPrefix:(NSString *)prefix URI:(NSString *)uri parentElement:(CXMLElement *)parent
{
- if (self = [super init])
+ if ((self = [super init]))
{
_prefix = [prefix copy];
_uri = [uri copy];

0 comments on commit 38a8043

Please sign in to comment.