gistfile1.txt

greg@ubuntu:/var/www/silk/lib$ git status
# On branch master
# Changed but not updated:
#   (use "git add/rm <file>..." to update what will be committed)
#
#       deleted:    ../config/routes.php.orig
#       deleted:    ../config/setup.yml.orig
#       modified:   ../index.php
#       modified:   silk/classes/class.silk_ajax.php
#       modified:   silk/classes/class.silk_application.php
#       modified:   silk/classes/class.silk_bootstrap.php
#       modified:   silk/classes/class.silk_controller_base.php
#       modified:   silk/classes/class.silk_database.php
#       modified:   silk/classes/class.silk_date_time.php
#       modified:   silk/classes/class.silk_form.php
#       modified:   silk/classes/class.silk_logger.php
#       modified:   silk/classes/class.silk_mail.php
#       modified:   silk/classes/class.silk_object.php
#       modified:   silk/classes/class.silk_request.php
#       modified:   silk/classes/class.silk_response.php
#       modified:   silk/classes/class.silk_route.php
#       modified:   silk/classes/class.silk_user.php
#       modified:   silk/classes/class.silk_xmlrpc.php
#       modified:   silk/classes/class.silk_yaml.php
#       modified:   silk/classes/orm/acts_as/class.silk_acts_as_attributed.php
#       modified:   silk/classes/orm/acts_as/class.silk_acts_as_list.php
#       modified:   silk/classes/orm/acts_as/class.silk_acts_as_nested_set.php
#       modified:   silk/classes/orm/acts_as/class.silk_acts_as_taggable.php
#       modified:   silk/classes/orm/acts_as/class.silk_acts_as_test.php
#       modified:   silk/classes/orm/class.silk_association_collection.php
#       modified:   silk/classes/orm/class.silk_has_many_association.php
#       modified:   silk/classes/orm/class.silk_has_one_association.php
#       modified:   silk/classes/orm/class.silk_object_relational_association.php
#       modified:   silk/classes/orm/class.silk_object_relational_manager.php
#       modified:   silk/classes/orm/class.silk_object_relational_mapping.php
#       modified:   silk/jquery/ui/ui.accordion.js
#       modified:   silk/jquery/ui/ui.calendar.js
#       modified:   silk/jquery/ui/ui.dialog.js
#       modified:   silk/jquery/ui/ui.draggable.ext.js
#       modified:   silk/jquery/ui/ui.draggable.js
#       modified:   silk/jquery/ui/ui.droppable.js
#       modified:   silk/jquery/ui/ui.magnifier.js
#       modified:   silk/jquery/ui/ui.mouse.js
#       modified:   silk/jquery/ui/ui.selectable.js
#       modified:   silk/jquery/ui/ui.shadow.js
#       modified:   silk/jquery/ui/ui.slider.js
#       modified:   silk/jquery/ui/ui.sortable.js
#       modified:   silk/jquery/ui/ui.tablesorter.js
#       modified:   silk/phpmailer/LICENSE
#       modified:   silk/phpmailer/class.phpmailer.php
#       modified:   silk/phpmailer/class.smtp.php
#       modified:   silk/phpmailer/language/phpmailer.lang-en.php
#       modified:   silk/plugins/block.label.php
#       modified:   silk/plugins/function.link.php
#       modified:   silk/plugins/function.textarea.php
#       modified:   silk/plugins/function.validation_errors.php
#       modified:   silk/silk.api.php
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       ../.htaccess
#       ../.project
#       ../app.tar.gz
#       ../components/
#       ../layouts/
#       silk/.gitignore
#       silk/.htaccess
#       silk/README.txt
#       silk/autogen.sh
#       silk/classes/class.silk_anonymous_user.php
#       silk/classes/class.silk_component_manager.php
#       silk/classes/class.silk_flash.php
#       silk/classes/class.silk_user_session.php
#       silk/config/
#       silk/doc/
#       silk/htaccess.txt
#       silk/index.php
#       silk/openid/
#       silk/silk.doxygen
#       ../pics/
#       ../test/
no changes added to commit (use "git add" and/or "git commit -a")
greg@ubuntu:/var/www/silk/lib$