Merge tag 'upstream/2.2.0'

Upstream version 2.2.0

1 files changed, 3 insertions, 3 deletions

diff --git a/setup.py b/setup.py
index 2d04341..b6e9619 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -32,13 +32,13 @@ NOTE: Installed SCons is not importable like usual Python packages. It is
       below is dedicated to make it happen on various platforms.
 """
 
-__revision__ = "src/setup.py 5357 2011/09/09 21:31:03 bdeegan"
+__revision__ = "src/setup.py issue-2856:2676:d23b7a2f45e8 2012/08/05 15:38:28 garyo"
 
 import os
 import stat
 import sys
 
-Version = "2.1.0"
+Version = "2.2.0"
 
 man_pages = [
     'scons.1',