[Rt-commit] rt branch, 4.0-trunk, updated. rt-4.0.2-19-g71df596

[Alex Vandiver]

The branch, 4.0-trunk has been updated
       via  71df59643b78fe13be4734f6b26ea2664636bbac (commit)
       via  ed83bb5e396092118550ff771414eb990de48b9a (commit)
       via  3771e7743f8fb10ddc3cbd243e7289c8c1dd3fd7 (commit)
       via  7d5b33bead9469e72756585e4c9935bb9486f845 (commit)
      from  443aa57b7f1601fe56916f117967e58867d4a8b9 (commit)

Summary of changes:
 .gitignore  |    3 +++
 Makefile.in |   41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 0 deletions(-)

- Log -----------------------------------------------------------------
commit 71df59643b78fe13be4734f6b26ea2664636bbac
Merge: 443aa57 ed83bb5
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Aug 18 15:22:32 2011 -0400

    Merge branch '4.0/make-jsmin-target' into 4.0-trunk
    
    Conflicts:
    	.gitignore

diff --cc .gitignore
index 368412c,a86885e..4fbbaa6
--- a/.gitignore
+++ b/.gitignore
@@@ -1,45 -1,48 +1,48 @@@
 -bin/rt-crontool
 -bin/rt-mailgate
 -bin/rt
 -etc/RT_Config.pm
 -etc/upgrade/3.8-branded-queues-extension
 -etc/upgrade/3.8-ical-extension
 -etc/upgrade/split-out-cf-categories
 -etc/upgrade/generate-rtaddressregexp
 -etc/upgrade/upgrade-articles
 -etc/upgrade/vulnerable-passwords
 -lib/RT/Generated.pm
 -Makefile
 -t/data/gnupg/keyrings/random_seed
 -t/data/configs/apache2.2+fastcgi.conf
 -t/data/configs/apache2.2+mod_perl.conf
 -t/tmp/
 -sbin/rt-attributes-viewer
 -sbin/rt-clean-sessions
 -sbin/rt-dump-database
 -sbin/rt-dump-metadata
 -sbin/rt-email-dashboards
 -sbin/rt-email-digest
 -sbin/rt-email-group-admin
 -sbin/rt-fulltext-indexer
 -sbin/rt-preferences-viewer
 -sbin/rt-server
 -sbin/rt-server.fcgi
 -sbin/rt-session-viewer
 -sbin/rt-setup-database
 -sbin/rt-setup-fulltext-index
 -sbin/rt-shredder
 -sbin/rt-test-dependencies
 -sbin/rt-validator
 -sbin/standalone_httpd
 -var/mason_data/
 -autom4te.cache
 -configure
 -config.status
 -config.log
 -config.pld
 -*~
 -*.swp
 -*.swo
 -.prove
 -nytprof.out*
 +/bin/rt-crontool
 +/bin/rt-mailgate
 +/bin/rt
 +/etc/RT_Config.pm
 +/etc/upgrade/3.8-branded-queues-extension
 +/etc/upgrade/3.8-ical-extension
 +/etc/upgrade/split-out-cf-categories
 +/etc/upgrade/generate-rtaddressregexp
 +/etc/upgrade/upgrade-articles
 +/etc/upgrade/vulnerable-passwords
 +/lib/RT/Generated.pm
 +/Makefile
 +/t/data/gnupg/keyrings/random_seed
 +/t/data/configs/apache2.2+fastcgi.conf
 +/t/data/configs/apache2.2+mod_perl.conf
 +/t/tmp/
 +/sbin/rt-attributes-viewer
 +/sbin/rt-clean-sessions
 +/sbin/rt-dump-database
 +/sbin/rt-dump-metadata
 +/sbin/rt-email-dashboards
 +/sbin/rt-email-digest
 +/sbin/rt-email-group-admin
 +/sbin/rt-fulltext-indexer
 +/sbin/rt-preferences-viewer
 +/sbin/rt-server
 +/sbin/rt-server.fcgi
 +/sbin/rt-session-viewer
 +/sbin/rt-setup-database
 +/sbin/rt-setup-fulltext-index
 +/sbin/rt-shredder
 +/sbin/rt-test-dependencies
 +/sbin/rt-validator
 +/sbin/standalone_httpd
 +/var/mason_data/
 +/autom4te.cache/
 +/configure
 +/config.status
 +/config.log
 +/config.pld
+ /jsmin.c
+ /jsmin
+ /bin/jsmin
 +/nytprof.out*
 +/.prove
 +*~
 +*.swp
 +*.swo

-----------------------------------------------------------------------