diff options
| author | Koushik Dutta <koushd@gmail.com> | 2013-08-14 10:01:22 -0700 |
|---|---|---|
| committer | Koushik Dutta <koushd@gmail.com> | 2013-08-14 10:01:22 -0700 |
| commit | 49a02b8c916e8ef011d9f56901d208eca626b85b (patch) | |
| tree | 1148a42ede0e6661854b8f92d4bbe52a4290d02b /heimdall/heimdall.vcxproj.filters | |
| parent | c82df274ecea32cd6528f070a21528bf80a2f466 (diff) | |
| parent | f95619028fa5c80284e6ade2ced7772e41040424 (diff) | |
| download | external_heimdall-49a02b8c916e8ef011d9f56901d208eca626b85b.zip external_heimdall-49a02b8c916e8ef011d9f56901d208eca626b85b.tar.gz external_heimdall-49a02b8c916e8ef011d9f56901d208eca626b85b.tar.bz2 | |
Merge remote-tracking branch 'bd/master' into cm-10.2
Conflicts:
Linux/README
OSX/README.txt
heimdall-frontend/doc-pak/README
heimdall/doc-pak/README
Change-Id: Ib5867d7a2be030290a3896ab82fe48a7f0a97e63
Diffstat (limited to 'heimdall/heimdall.vcxproj.filters')
| -rw-r--r-- | heimdall/heimdall.vcxproj.filters | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/heimdall/heimdall.vcxproj.filters b/heimdall/heimdall.vcxproj.filters index 6cec0df..cbc0f98 100644 --- a/heimdall/heimdall.vcxproj.filters +++ b/heimdall/heimdall.vcxproj.filters @@ -130,9 +130,6 @@ <ClInclude Include="source\Utility.h">
<Filter>Source</Filter>
</ClInclude>
- <ClInclude Include="source\DumpAction.h">
- <Filter>Source\Interface</Filter>
- </ClInclude>
<ClInclude Include="source\DetectAction.h">
<Filter>Source\Interface</Filter>
</ClInclude>
@@ -174,9 +171,6 @@ <ClCompile Include="source\Utility.cpp">
<Filter>Source</Filter>
</ClCompile>
- <ClCompile Include="source\DumpAction.cpp">
- <Filter>Source\Interface</Filter>
- </ClCompile>
<ClCompile Include="source\DetectAction.cpp">
<Filter>Source\Interface</Filter>
</ClCompile>
|