Reverting failed mering of SOC2014_TASKBAR.

Command: git svn dcommit is aborted, and the two branches is diverged.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chaobin, Zhang 2014-09-10 11:57:58 +00:00
parent f0269755aa
commit 23ce61c395
21 changed files with 2 additions and 1450 deletions

View file

@ -1002,7 +1002,6 @@
<ClCompile Include="..\..\src\generic\vlbox.cpp" />
<ClCompile Include="..\..\src\generic\vscroll.cpp" />
<ClCompile Include="..\..\src\xrc\xmlreshandler.cpp" />
<ClCompile Include="..\..\src\msw\taskbarbutton.cpp" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\src\msw\version.rc">
@ -1123,7 +1122,6 @@
<ClInclude Include="..\..\include\wx\msw\statline.h" />
<ClInclude Include="..\..\include\wx\msw\stattext.h" />
<ClInclude Include="..\..\include\wx\msw\statusbar.h" />
<ClInclude Include="..\..\include\wx\msw\taskbarbutton.h" />
<ClInclude Include="..\..\include\wx\msw\textctrl.h" />
<ClInclude Include="..\..\include\wx\msw\textentry.h" />
<ClInclude Include="..\..\include\wx\msw\tglbtn.h" />
@ -1329,7 +1327,6 @@
<ClInclude Include="..\..\include\wx\statline.h" />
<ClInclude Include="..\..\include\wx\stattext.h" />
<ClInclude Include="..\..\include\wx\statusbr.h" />
<ClInclude Include="..\..\include\wx\taskbarbutton.h" />
<ClInclude Include="..\..\include\wx\tbarbase.h" />
<ClInclude Include="..\..\include\wx\textcompleter.h" />
<ClInclude Include="..\..\include\wx\textctrl.h" />
@ -1373,4 +1370,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>