Shannon 73c34fda9c Merge branch 'dev-v7' of https://github.com/michaeljfarr/Umbraco-CMS into michaeljfarr-dev-v7 ...

Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Core/packages.config
	src/Umbraco.Web/Umbraco.Web.csproj

2015-05-14 08:38:51 +10:00

..

IProfiler.cs

Creates ProfilingLogger in order to decouple the DisposableTimer from LogHelper and ProfilerResolver

2015-01-16 12:07:29 +11:00

LogProfiler.cs

decouples more of LogHelper and DisposableTimer

2015-01-16 12:29:27 +11:00

ProfilerExtensions.cs

Upgraded DisposableTimer to wrap the profiler... now we should really just use DisposableTimer for all profiling.

2013-05-13 21:11:03 -10:00

ProfilerResolver.cs

Upgraded DisposableTimer to wrap the profiler... now we should really just use DisposableTimer for all profiling.

2013-05-13 21:11:03 -10:00

WebProfiler.cs

Manually merge branch 'allyen-6.1.4-shibboleth' into 7.2.0

2014-10-03 12:58:30 +10:00