Unified Diff: src/plugin/PluginWbPassThrough.cpp
Issue 5171515343503360:
Issue #41 - Bring method of determining IE version up to date (Closed)
Patch Set: Final (?)
Created Jan. 4, 2015, 11:02 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« src/plugin/PluginTabBase.cpp ('k')
|
src/shared/IE_version.h » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: src/plugin/PluginWbPassThrough.cpp |
| =================================================================== |
| --- a/src/plugin/PluginWbPassThrough.cpp |
| +++ b/src/plugin/PluginWbPassThrough.cpp |
| @@ -10,6 +10,7 @@ |
| #include <WinInet.h> |
| #include "wtypes.h" |
| #include "../shared/Utils.h" |
| +<Merge Conflict>#include "../shared/IE_version.h" |
|
sergei
2015/01/05 12:24:23
"Merge Conflict"
Do we need this header here?
Eric
2015/01/05 13:08:21
And this is why I dislike rebase.
The relevant ch
|
| namespace |
| { |
« no previous file with comments
|
« src/plugin/PluginTabBase.cpp ('k')
|
src/shared/IE_version.h » ('j')
|
no next file with comments »
