diff options
| author | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-02 08:39:14 -0400 |
|---|---|---|
| committer | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-02 08:39:14 -0400 |
| commit | dfc12d728c6fd1d65db0ff0a3e97d79c3c14d496 (patch) | |
| tree | 69e7fe0841345f04b76fafc0827ce916ff1fbbc7 | |
| parent | a8ccac4d187d490d993ce9d49f1bc1d18c3ce621 (diff) | |
| parent | d35ebf14f6115207874ebc2b724ea83b968fccc1 (diff) | |
Merge
| -rw-r--r-- | .hgignore | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -37,4 +37,5 @@ _ReSharper*/ # ncrunch files
*.ncrunchsolution
-*.ncrunchproject
\ No newline at end of file +*.ncrunchproject
+MediaBrowser.Common/Kernel/BaseKernel.cs.orig
|