From c6a23ad6d5e2748fe9f9c5b0e4447fd377351f82 Mon Sep 17 00:00:00 2001
From: Tharsan Bhuvanendran <me@tharsan.com>
Date: Fri, 16 Mar 2012 18:47:11 -0300
Subject: [PATCH 1/2] Updated Magento.gitignore for the latest Enterprise
 edition.

---
 Magento.gitignore | 47 +++++++++--------------------------------------
 1 file changed, 9 insertions(+), 38 deletions(-)

diff --git a/Magento.gitignore b/Magento.gitignore
index b32a91d2..cbdc7650 100644
--- a/Magento.gitignore
+++ b/Magento.gitignore
@@ -1,3 +1,4 @@
+.modgit/
 app/code/community/Find/
 app/code/community/Phoenix/
 app/code/core/
@@ -8,7 +9,9 @@ app/design/frontend/default/blank/
 app/design/frontend/default/default/
 app/design/frontend/default/iphone/
 app/design/frontend/default/modern/
+app/design/frontend/enterprise/default
 app/design/install/
+app/etc/modules/Enterprise_*
 app/etc/modules/Find_Feed.xml
 app/etc/modules/Mage_All.xml
 app/etc/modules/Mage_Api.xml
@@ -19,6 +22,7 @@ app/etc/modules/Mage_Compiler.xml
 app/etc/modules/Mage_Connect.xml
 app/etc/modules/Mage_Downloadable.xml
 app/etc/modules/Mage_ImportExport.xml
+app/etc/modules/Mage_LoadTest.xml
 app/etc/modules/Mage_PageCache.xml
 app/etc/modules/Mage_Persistent.xml
 app/etc/modules/Mage_Weee.xml
@@ -26,10 +30,11 @@ app/etc/modules/Mage_Widget.xml
 app/etc/modules/Mage_XmlConnect.xml
 app/etc/modules/Phoenix_Moneybookers.xml
 app/etc/config.xml
+app/etc/enterprise.xml
 app/etc/local.xml.additional
 app/etc/local.xml.template
 app/.htaccess
-app/locale/en_US/
+app/locale/
 app/Mage.php
 cron.php
 cron.sh
@@ -43,7 +48,9 @@ index.php.sample
 install.php
 js/blank.html
 js/calendar/
+js/enterprise/
 js/extjs/
+js/firebug/
 js/flash/
 js/index.php
 js/jscolor/
@@ -55,42 +62,6 @@ js/spacer.gif
 js/tiny_mce/
 js/varien/
 lib/3Dsecure/
+lib/Apache/
 lib/flex/
 lib/googlecheckout/
-lib/.htaccess
-lib/LinLibertineFont/
-lib/Mage/
-lib/PEAR/
-lib/phpseclib/
-lib/Varien/
-lib/Zend/
-LICENSE_AFL.txt
-LICENSE.html
-LICENSE.txt
-mage
-media/customer/
-media/downloadable/
-media/.htaccess
-media/import/
-media/xmlconnect/
-nbproject/
-pear
-pear/
-php.ini.sample
-pkginfo/
-RELEASE_NOTES.txt
-shell/abstract.php
-shell/compiler.php
-shell/indexer.php
-shell/log.php
-skin/adminhtml/default/default/
-skin/frontend/base/
-skin/frontend/default/blank/
-skin/frontend/default/blue/
-skin/frontend/default/default/
-skin/frontend/default/french/
-skin/frontend/default/german/
-skin/frontend/default/iphone/
-skin/frontend/default/modern/
-skin/install/
-var/
\ No newline at end of file

From 49977476d3de60f00206326a72acbbf12be3ef22 Mon Sep 17 00:00:00 2001
From: Tharsan Bhuvanendran <me@tharsan.com>
Date: Fri, 16 Mar 2012 18:49:26 -0300
Subject: [PATCH 2/2] Restored missing lines.

---
 Magento.gitignore | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/Magento.gitignore b/Magento.gitignore
index cbdc7650..52e8bb25 100644
--- a/Magento.gitignore
+++ b/Magento.gitignore
@@ -65,3 +65,43 @@ lib/3Dsecure/
 lib/Apache/
 lib/flex/
 lib/googlecheckout/
+lib/.htaccess
+lib/LinLibertineFont/
+lib/Mage/
+lib/PEAR/
+lib/phpseclib/
+lib/Varien/
+lib/Zend/
+LICENSE_AFL.txt
+LICENSE.html
+LICENSE.txt
+LICENSE_EE*
+mage
+media/customer/
+media/downloadable/
+media/.htaccess
+media/import/
+media/xmlconnect/
+nbproject/
+pear
+pear/
+php.ini.sample
+pkginfo/
+RELEASE_NOTES.txt
+shell/abstract.php
+shell/compiler.php
+shell/indexer.php
+shell/log.php
+skin/adminhtml/default/default/
+skin/adminhtml/default/enterprise
+skin/frontend/base/
+skin/frontend/default/blank/
+skin/frontend/default/blue/
+skin/frontend/default/default/
+skin/frontend/default/french/
+skin/frontend/default/german/
+skin/frontend/default/iphone/
+skin/frontend/default/modern/
+skin/frontend/enterprise
+skin/install/
+var/