Author: david
Date: Mon Aug 20 14:35:04 2012
New Revision: 12148
Log:
Merge r12136:12145 from trunk
Modified:
branches/ica-atom/ (props changed)
branches/ica-atom/apps/qubit/modules/actor/actions/contextMenuComponent.class.php
(props changed)
branches/ica-atom/config/package.xml
branches/ica-atom/favicon.ico (props changed)
branches/ica-atom/images/logo.png (props changed)
branches/ica-atom/plugins/qbAclPlugin/lib/vendor/Zend/ (props changed)
branches/ica-atom/plugins/sfDrupalPlugin/vendor/drupal/ (props changed)
branches/ica-atom/vendor/symfony/ (props changed)
branches/ica-atom/vendor/symfony/lib/task/i18n/sfI18nExtractPluginTask.class.php
(props changed)
branches/ica-atom/vendor/yui/ (props changed)
Modified: branches/ica-atom/config/package.xml
==============================================================================
--- branches/ica-atom/config/package.xml Mon Aug 20 12:03:29 2012
(r12147)
+++ branches/ica-atom/config/package.xml Mon Aug 20 14:35:04 2012
(r12148)
@@ -36,6 +36,7 @@
<file name="css//*" role="data"/>
<file name="data//*" role="data"/>
<file name="ead.dtd" role="data"/>
+ <file name="favicon.ico" role="data"/>
<file name="images//*" role="data"/>
<file name="index.php" role="php"/>
<file name="js//*" role="data"/>
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
