Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v1.2-windows'
Browse files Browse the repository at this point in the history
  • Loading branch information
mital committed Aug 11, 2012
2 parents 8ab7286 + e2858c3 commit f5aeb8c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion kroll
Submodule kroll updated from fa87d0 to 17738b
4 changes: 2 additions & 2 deletions modules/ti.UI/win/UIWin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ UIWin::UIWin()
// Hook app:// and ti:// URL support to WebKit
setNormalizeURLCallback(NormalizeURLCallback);
setURLToFileURLCallback(URLToFileURLCallback);
setCanPreprocessCallback(CanPreprocessURLCallback);
setPreprocessCallback(PreprocessURLCallback);
//setCanPreprocessCallback(CanPreprocessURLCallback);
//setPreprocessCallback(PreprocessURLCallback);
setProxyCallback(ProxyForURLCallback);

std::string cookieJarFilename(FileUtils::Join(
Expand Down

0 comments on commit f5aeb8c

Please sign in to comment.