merge 1.0.x changes / fixed setup.py

--HG-- branch : trunk
2009-06-24 18:08:43 +02:00 · 2009-06-24 18:08:43 +02:00 · 5a52e21728
parent bb5ef52a58 e412f695dd
commit 5a52e21728
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -383,4 +383,4 @@ py/xmlobj/testing/__init__.py
 py/xmlobj/testing/test_html.py
 py/xmlobj/testing/test_xml.py
 py/xmlobj/visit.py
-py/xmlobj/xml.py
+py/xmlobj/xml.py
--- a/setup.py
+++ b/setup.py
@ -149,4 +149,4 @@ def main():
 if __name__ == '__main__':
    main()
-        
+
`@ -149,4 +149,4 @@ def main():`

	`if __name__ == '__main__':`	`if __name__ == '__main__':`
	`main()`	`main()`