Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Alchemy Viewer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Releases
- Package registry
- Terraform modules

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

7d38dd51

Commit 7d38dd51 authored 15 years ago by Vadim Savchuk

Downloads
- Plain Diff

Manual merge from default branch.

Resolved a conflict in indra/llui/llurlentry.cpp. That broke the fix for EXT-6357.

--HG--
branch : product-engine

parents f6b48339 a7085418

No related branches found

No related tags found

Loading

Changes 193

Hide whitespace changes

Inline Side-by-side

Showing

indra/llcommon/llassettype.cpp 37 additions, 37 deletions

indra/llcommon/llassettype.cpp
indra/llcommon/llassettype.h 4 additions, 4 deletions

indra/llcommon/llassettype.h
indra/llcommon/lluri.cpp 2 additions, 1 deletion

indra/llcommon/lluri.cpp
indra/llcommon/lluuid.cpp 100 additions, 62 deletions

indra/llcommon/lluuid.cpp
indra/llmessage/llcurl.cpp 11 additions, 18 deletions

indra/llmessage/llcurl.cpp
indra/llmessage/llcurl.h 1 addition, 11 deletions

indra/llmessage/llcurl.h
indra/llmessage/llhttpclient.cpp 12 additions, 4 deletions

indra/llmessage/llhttpclient.cpp
indra/llmessage/llhttpclient.h 9 additions, 2 deletions

indra/llmessage/llhttpclient.h
indra/llmessage/llurlrequest.cpp 42 additions, 9 deletions

indra/llmessage/llurlrequest.cpp
indra/llmessage/llurlrequest.h 10 additions, 58 deletions

indra/llmessage/llurlrequest.h
indra/llui/llbutton.cpp 1 addition, 1 deletion

indra/llui/llbutton.cpp
indra/llui/llcombobox.cpp 0 additions, 1 deletion

indra/llui/llcombobox.cpp
indra/llui/lleditmenuhandler.cpp 7 additions, 0 deletions

indra/llui/lleditmenuhandler.cpp
indra/llui/lleditmenuhandler.h 1 addition, 1 deletion

indra/llui/lleditmenuhandler.h
indra/llui/llflatlistview.cpp 13 additions, 12 deletions

indra/llui/llflatlistview.cpp
indra/llui/llflatlistview.h 3 additions, 4 deletions

indra/llui/llflatlistview.h
indra/llui/lllineeditor.cpp 17 additions, 101 deletions

indra/llui/lllineeditor.cpp
indra/llui/lllineeditor.h 0 additions, 4 deletions

indra/llui/lllineeditor.h
indra/llui/llmenugl.cpp 1 addition, 1 deletion

indra/llui/llmenugl.cpp
indra/llui/llmultifloater.cpp 1 addition, 1 deletion

indra/llui/llmultifloater.cpp

with 272 additions and 332 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment