Merge remote-tracking branch 'origin/released'

* origin/released:
  xwininfo mesa git update 11 oct 2012

Conflicts:
	mesalib/src/mapi/glapi/gen/glX_proto_recv.py
	mesalib/src/mapi/glapi/gen/glX_proto_size.py
	mesalib/src/mapi/glapi/gen/glX_server_table.py
	mesalib/src/mapi/glapi/gen/gl_table.py
	mesalib/src/mesa/main/.gitignore

1 files changed, 38 insertions, 38 deletions

diff --git a/mesalib/src/mapi/glapi/gen/gl_gentable.py b/mesalib/src/mapi/glapi/gen/gl_gentable.py
index 72ec569db..74611a76b 100644
--- a/mesalib/src/mapi/glapi/gen/gl_gentable.py
+++ b/mesalib/src/mapi/glapi/gen/gl_gentable.py
@@ -138,65 +138,65 @@ body_template = """
 
 class PrintCode(gl_XML.gl_print_base):
 
-	def __init__(self):
-		gl_XML.gl_print_base.__init__(self)
+    def __init__(self):
+        gl_XML.gl_print_base.__init__(self)
 
-		self.name = "gl_gen_table.py (from Mesa)"
-		self.license = license.bsd_license_template % ( \
+        self.name = "gl_gen_table.py (from Mesa)"
+        self.license = license.bsd_license_template % ( \
 """Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
 (C) Copyright IBM Corporation 2004, 2005
 (C) Copyright Apple Inc 2011""", "BRIAN PAUL, IBM")
 
-		return
+        return
 
 
-	def get_stack_size(self, f):
-		size = 0
-		for p in f.parameterIterator():
-			if p.is_padding:
-				continue
+    def get_stack_size(self, f):
+        size = 0
+        for p in f.parameterIterator():
+            if p.is_padding:
+                continue
 
-			size += p.get_stack_size()
+            size += p.get_stack_size()
 
-		return size
+        return size
 
 
-	def printRealHeader(self):
-		print header
-		return
+    def printRealHeader(self):
+        print header
+        return
 
 
-	def printRealFooter(self):
-		print footer
-		return
+    def printRealFooter(self):
+        print footer
+        return
 
 
-	def printBody(self, api):
-		for f in api.functionIterateByOffset():
-			for entry_point in f.entry_points:
-				vars = { 'entry_point' : entry_point,
-				         'name' : f.name }
+    def printBody(self, api):
+        for f in api.functionIterateByOffset():
+            for entry_point in f.entry_points:
+                vars = { 'entry_point' : entry_point,
+                         'name' : f.name }
 
-				print body_template % vars
-		return
+                print body_template % vars
+        return
 
 def show_usage():
-	print "Usage: %s [-f input_file_name]" % sys.argv[0]
-	sys.exit(1)
+    print "Usage: %s [-f input_file_name]" % sys.argv[0]
+    sys.exit(1)
 
 if __name__ == '__main__':
-	file_name = "gl_API.xml"
+    file_name = "gl_API.xml"
 
-	try:
-		(args, trail) = getopt.getopt(sys.argv[1:], "m:f:")
-	except Exception,e:
-		show_usage()
+    try:
+        (args, trail) = getopt.getopt(sys.argv[1:], "m:f:")
+    except Exception,e:
+        show_usage()
 
-	for (arg,val) in args:
-		if arg == "-f":
-			file_name = val
+    for (arg,val) in args:
+        if arg == "-f":
+            file_name = val
 
-	printer = PrintCode()
+    printer = PrintCode()
 
-	api = gl_XML.parse_GL_API(file_name, glX_XML.glx_item_factory())
-	printer.Print(api)
+    api = gl_XML.parse_GL_API(file_name, glX_XML.glx_item_factory())
+    printer.Print(api)