Merge pull request #177 from L42y/patch-1

update Magento.gitignore to work with Magento 1.6
This commit is contained in:
Chris Wanstrath 2011-09-01 16:34:35 -07:00
commit eb10754c71

View File

@ -1,24 +1,34 @@
app/code/community/Find/
app/code/community/Phoenix/ app/code/community/Phoenix/
app/code/core/ app/code/core/
app/design/adminhtml/default/default/ app/design/adminhtml/default/default/
app/design/adminhtml/default/find/
app/design/frontend/base/ app/design/frontend/base/
app/design/frontend/default/default/
app/design/frontend/default/blank/ app/design/frontend/default/blank/
app/design/frontend/default/default/
app/design/frontend/default/iphone/ app/design/frontend/default/iphone/
app/design/frontend/default/modern/ app/design/frontend/default/modern/
app/design/install/ app/design/install/
app/etc/modules/Find_Feed.xml
app/etc/modules/Mage_All.xml app/etc/modules/Mage_All.xml
app/etc/modules/Mage_Api.xml app/etc/modules/Mage_Api.xml
app/etc/modules/Mage_Authorizenet.xml
app/etc/modules/Mage_Bundle.xml app/etc/modules/Mage_Bundle.xml
app/etc/modules/Mage_Centinel.xml app/etc/modules/Mage_Centinel.xml
app/etc/modules/Mage_Compiler.xml app/etc/modules/Mage_Compiler.xml
app/etc/modules/Mage_Connect.xml
app/etc/modules/Mage_Downloadable.xml app/etc/modules/Mage_Downloadable.xml
app/etc/modules/Mage_ImportExport.xml
app/etc/modules/Mage_PageCache.xml
app/etc/modules/Mage_Persistent.xml
app/etc/modules/Mage_Weee.xml app/etc/modules/Mage_Weee.xml
app/etc/modules/Mage_Widget.xml app/etc/modules/Mage_Widget.xml
app/etc/modules/Mage_XmlConnect.xml
app/etc/modules/Phoenix_Moneybookers.xml app/etc/modules/Phoenix_Moneybookers.xml
app/etc/config.xml app/etc/config.xml
app/etc/local.xml.additional app/etc/local.xml.additional
app/etc/local.xml.template app/etc/local.xml.template
app/.htaccess
app/locale/en_US/ app/locale/en_US/
app/Mage.php app/Mage.php
cron.php cron.php
@ -26,38 +36,49 @@ cron.sh
downloader/ downloader/
errors/ errors/
favicon.ico favicon.ico
get.php
includes/ includes/
index.php index.php
index.php.sample index.php.sample
install.php install.php
js/blank.html js/blank.html
js/extjs/
js/lib/
js/prototype/
js/spacer.gif
js/varien/
js/calendar/ js/calendar/
js/extjs/
js/flash/ js/flash/
js/index.php js/index.php
js/jscolor/
js/lib/
js/mage/ js/mage/
js/prototype/
js/scriptaculous/ js/scriptaculous/
js/spacer.gif
js/tiny_mce/ js/tiny_mce/
js/varien/
lib/3Dsecure/ lib/3Dsecure/
lib/flex/ lib/flex/
lib/googlecheckout/ lib/googlecheckout/
lib/.htaccess
lib/LinLibertineFont/ lib/LinLibertineFont/
lib/Mage/
lib/PEAR/ lib/PEAR/
lib/phpseclib/
lib/Varien/ lib/Varien/
lib/Zend/ lib/Zend/
LICENSE_AFL.txt LICENSE_AFL.txt
LICENSE.html LICENSE.html
LICENSE.txt LICENSE.txt
mage
media/customer/
media/downloadable/ media/downloadable/
media/.htaccess
media/import/ media/import/
media/xmlconnect/
nbproject/ nbproject/
pear
pear/ pear/
php.ini.sample php.ini.sample
pkginfo/ pkginfo/
RELEASE_NOTES.txt
shell/abstract.php shell/abstract.php
shell/compiler.php shell/compiler.php
shell/indexer.php shell/indexer.php
@ -72,5 +93,4 @@ skin/frontend/default/german/
skin/frontend/default/iphone/ skin/frontend/default/iphone/
skin/frontend/default/modern/ skin/frontend/default/modern/
skin/install/ skin/install/
var/ var/
pear