[Pkg-cli-libs-commits] [SCM] nunit branch, master, updated. debian/2.5.10.11092+dfsg-3-11-ge508942

[Julian Taylor]

The following commit has been merged in the master branch:
commit ec6c830adca8a543388ffe090c1a13e0c5dabc5b
Merge: 1b70b847ef923f1b699f4e3d8d101cc1f85c90d4 f163f73dce34f2e7889bf5467363455101bbacab
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Sun Apr 15 17:00:06 2012 +0200

    Merge tag 'upstream/2.6.0.12051+dfsg'
    
    Upstream version 2.6.0.12051+dfsg
    
    Conflicts:
    	NUnitTests.config
    	doc/img/addinsDialog.jpg
    	doc/img/advancedSettings.jpg
    	doc/img/assembliesTab.jpg
    	doc/img/assemblyReloadSettings.jpg
    	doc/img/configEditor.jpg
    	doc/img/console-mock.jpg
    	doc/img/generalSettings.jpg
    	doc/img/generalTab.jpg
    	doc/img/gui-screenshot.jpg
    	doc/img/gui-verify.jpg
    	doc/img/internalTraceSettings.jpg
    	doc/img/miniGui.jpg
    	doc/img/testLoadSettings.jpg
    	doc/img/testProperties.jpg
    	doc/img/testResultSettings.jpg
    	doc/img/textOutputSettings.jpg
    	doc/img/treeDisplaySettings.jpg
    	doc/img/visualStudioSettings.jpg
    	doc/settingsDialog.html
    	install/samples.wxs
    	license.rtf
    	src/ClientUtilities/tests/FileWatcherTest.cs
    	src/ConsoleRunner/nunit-console-exe/App.v1.config
    	src/GuiComponents/UiKit/Images/Tree/Circles/Ignored.jpg
    	src/GuiComponents/UiKit/Images/Tree/Circles/Skipped.jpg
    	src/GuiComponents/UiKit/Images/Tree/Circles/Success.jpg
    	src/GuiComponents/UiKit/Images/Tree/Classic/Failure.jpg
    	src/GuiComponents/UiKit/Images/Tree/Classic/Ignored.jpg
    	src/GuiComponents/UiKit/Images/Tree/Classic/Skipped.jpg
    	src/GuiComponents/UiKit/Images/Tree/Classic/Success.jpg
    	src/GuiComponents/UiKit/TestLoaderUI.cs
    	src/GuiComponents/UiKit/UserMessage.cs
    	src/GuiRunner/nunit-gui/App.ico
    	src/GuiRunner/nunit-gui/ProjectEditor.cs
    	src/GuiRunner/nunit-gui/ProjectEditor.resx
    	src/GuiRunner/tests/ProjectEditorTests.cs
    	src/NUnitCore/core/LogCapture.cs
    	src/NUnitCore/tests/MockTestRunner.cs
    	src/NUnitExtensions/framework/nunit.framework.extensions.dll_VS2005.csproj
    	src/NUnitFixtures/fixtures/AssemblyRunner.cs
    	src/NUnitFixtures/fixtures/PlatformInfo.cs
    	src/NUnitFixtures/fixtures/SnippetRunner.cs
    	src/NUnitFixtures/fixtures/TestLoadFixture.cs
    	src/NUnitFixtures/fixtures/TestTree.cs
    	src/NUnitFixtures/fixtures/nunit.fixtures.build
    	src/NUnitFixtures/fixtures/nunit.fixtures.csproj
    	src/NUnitFixtures/tests/CompilationTests.cs
    	src/NUnitFixtures/tests/TestTreeTests.cs
    	src/NUnitFixtures/tests/nunit.fixtures.tests.build
    	src/NUnitFixtures/tests/nunit.fixtures.tests.csproj
    	src/NUnitTestServer/nunit-agent-exe/App.config
    	src/NUnitTestServer/nunit-agent-exe/App.v1.config
    	src/NUnitTestServer/nunit-agent-exe/nunit-agent.exe.csproj
    	src/NUnitTestServer/nunit-server-exe/App.ico
    	src/PNUnit/agent/App.ico
    	src/PNUnit/pnunit.framework/pnunit.framework.csproj
    	src/PNUnit/tests/pnunit.tests.csproj
    	src/ProjectEditor/editor/ConfigurationEditor/RenameConfigurationDialog.resx
    	src/ProjectEditor/editor/PropertyEditor/PropertyView.resx
    	src/tests/loadtest-assembly/AAA/Class1.cs
    	src/tests/loadtest-assembly/AAA/Class2.cs
    	src/tests/loadtest-assembly/AAA/Class3.cs
    	src/tests/loadtest-assembly/AAA/Class4.cs
    	src/tests/loadtest-assembly/AAA/Class5.cs
    	src/tests/loadtest-assembly/BBB/Class1.cs
    	src/tests/loadtest-assembly/BBB/Class2.cs
    	src/tests/loadtest-assembly/BBB/Class3.cs
    	src/tests/loadtest-assembly/BBB/Class4.cs
    	src/tests/loadtest-assembly/BBB/Class5.cs
    	src/tests/loadtest-assembly/CCC/Class1.cs
    	src/tests/loadtest-assembly/CCC/Class2.cs
    	src/tests/loadtest-assembly/CCC/Class3.cs
    	src/tests/loadtest-assembly/CCC/Class4.cs
    	src/tests/loadtest-assembly/CCC/Class5.cs
    	src/tests/loadtest-assembly/DDD/Class1.cs
    	src/tests/loadtest-assembly/DDD/Class2.cs
    	src/tests/loadtest-assembly/DDD/Class3.cs
    	src/tests/loadtest-assembly/DDD/Class4.cs
    	src/tests/loadtest-assembly/DDD/Class5.cs
    	src/tests/loadtest-assembly/loadtest-assembly.build
    	src/tests/loadtest-assembly/loadtest-assembly.csproj
    	src/tests/mock-assembly/mock-assembly.dll.config
    	src/tests/timing-tests/AssemblyLoadTests.cs
    	src/tests/timing-tests/ClientTimeoutFixture.cs
    	src/tests/timing-tests/timing-tests.build
    	src/tests/timing-tests/timing-tests.csproj
    	tools/src/Gensyntax/AssemblyInfo.cs

diff --combined doc/img/addinsDialog.jpg.BASE.9364.jpg
index 0000000,0000000..e69de29
new file mode 100644
--- /dev/null
+++ b/doc/img/addinsDialog.jpg.BASE.9364.jpg
diff --combined src/PNUnit/tests/pnunit.tests.csproj.BASE.10870.csproj
index 0000000,0000000..e69de29
new file mode 100644
--- /dev/null
+++ b/src/PNUnit/tests/pnunit.tests.csproj.BASE.10870.csproj

-- 
nunit