CRM-12274 - redo all changes due to bad rebase
authorDonald A. Lobo <lobo@civicrm.org>
Mon, 8 Apr 2013 19:11:51 +0000 (12:11 -0700)
committerDonald A. Lobo <lobo@civicrm.org>
Mon, 8 Apr 2013 19:12:05 +0000 (12:12 -0700)
commit91da6cd5811b049d5a6485cb3e3d7560d2f73c94
treeb1063ce5272d2e5b29f517026d3dd761e53114aa
parent00b1b9f1cd7e74d58eea4d8366b14d22c75d6383
CRM-12274 - redo all changes due to bad rebase

----------------------------------------
* CRM-12274: Merge activity tables into one unified table activity contact table
  http://issues.civicrm.org/jira/browse/CRM-12274
19 files changed:
CRM/Activity/BAO/Activity.php
CRM/Activity/BAO/ActivityAssignment.php
CRM/Activity/BAO/ActivityTarget.php
CRM/Activity/BAO/Query.php
CRM/Campaign/BAO/Query.php
CRM/Campaign/BAO/Survey.php
CRM/Campaign/Selector/Search.php
CRM/Case/XMLProcessor/Process.php
CRM/Contact/BAO/Contact/Utils.php
CRM/Contact/BAO/Query.php
CRM/Contact/Form/Search/Custom/FullText.php
CRM/Dedupe/Merger.php
CRM/Friend/BAO/Friend.php
sql/GenerateData.php
sql/civicrm_generated.mysql
tests/phpunit/CiviTest/truncate.xml
xml/schema/Activity/ActivityContact.xml
xml/schema/Activity/files.xml
xml/version.xml