diff options
| author | Fabian Becker <halfdan@xnorfz.de> | 2013-06-22 23:47:29 +0400 |
|---|---|---|
| committer | Fabian Becker <halfdan@xnorfz.de> | 2013-06-22 23:47:29 +0400 |
| commit | 165ac7aeec855234e8c60bd758fad39bd6659adf (patch) | |
| tree | e42ace9f7f45e420f883245a8df1beefa8eac9b0 /.gitignore | |
| parent | 89d41940a87d449114f529df115b62d3987f88ce (diff) | |
| parent | e2e5176279255b7ff2d80f0f511a1ef5f3748ebe (diff) | |
Huge merge! Lets see how the tests run..
Merge branch 'master' into 2.x-twig
Conflicts:
core/ReportRenderer/Html.php
core/SmartyPlugins/function.ajaxLoadingDiv.php
plugins/CoreAdminHome/templates/jsTrackingGenerator.tpl
plugins/CoreHome/templates/donate.tpl
plugins/CoreHome/templates/html_report_header.tpl
plugins/CoreHome/templates/menu.tpl
plugins/CoreHome/templates/period_select.tpl
plugins/CoreHome/templates/reports_by_dimension.tpl
plugins/Feedback/templates/index.tpl
plugins/Goals/Controller.php
plugins/Goals/templates/overview.tpl
plugins/Live/API.php
plugins/Live/templates/lastVisits.tpl
plugins/Live/templates/visitorLog.tpl
plugins/MobileMessaging/templates/SMSReport.tpl
plugins/PDFReports/templates/add.tpl
plugins/PDFReports/templates/list.tpl
plugins/PDFReports/templates/report_parameters.tpl
plugins/SEO/templates/index.tpl
plugins/SegmentEditor/templates/selector.twig
plugins/UserCountry/javascripts/userCountry.js
plugins/Zeitgeist/stylesheets/common.css
tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 1836509077..ea85a39e61 100644 --- a/.gitignore +++ b/.gitignore @@ -34,7 +34,10 @@ tests/PHPUnit/Integration/processed/ tests/PHPUnit/phpunit.xml tests/results/ tests/lib/xhprof-0.9.2/extension/.libs +tests/lib/xhprof-0.9.2/extension/.deps tests/lib/xhprof-0.9.2/extension/Makefile +tests/lib/xhprof-0.9.2/extension/Makefile.fragments +tests/lib/xhprof-0.9.2/extension/Makefile.global tests/lib/xhprof-0.9.2/extension/Makefile.objects tests/lib/xhprof-0.9.2/extension/config.log tests/lib/xhprof-0.9.2/extension/config.nice @@ -43,6 +46,20 @@ tests/lib/xhprof-0.9.2/extension/libtool tests/lib/xhprof-0.9.2/extension/modules tests/lib/xhprof-0.9.2/extension/xhprof.la tests/lib/xhprof-0.9.2/extension/xhprof.lo +tests/lib/xhprof-0.9.2/extension/aclocal.m4 +tests/lib/xhprof-0.9.2/extension/autom4te.cache +tests/lib/xhprof-0.9.2/extension/config.guess +tests/lib/xhprof-0.9.2/extension/config.h +tests/lib/xhprof-0.9.2/extension/config.h.in +tests/lib/xhprof-0.9.2/extension/config.sub +tests/lib/xhprof-0.9.2/extension/configure +tests/lib/xhprof-0.9.2/extension/configure.in +tests/lib/xhprof-0.9.2/extension/acinclude.m4 +tests/lib/xhprof-0.9.2/extension/install-sh +tests/lib/xhprof-0.9.2/extension/ltmain.sh +tests/lib/xhprof-0.9.2/extension/missing +tests/lib/xhprof-0.9.2/extension/mkinstalldirs +tests/lib/xhprof-0.9.2/extension/run-tests.php docs/ composer.phar composer.lock |