Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Tales of MajEyal
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

242b6f1b

Commit 242b6f1b authored 10 years ago by DarkGod

Downloads
- Plain Diff

Merge branch 'master' of git.net-core.org:darkgod/t-engine4

parents 575137f7 f9060b7a

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

game/engines/default/engine/ui/WebView.lua 4 additions, 0 deletions

game/engines/default/engine/ui/WebView.lua
game/engines/default/modules/boot/dialogs/MainMenu.lua 1 addition, 0 deletions

game/engines/default/modules/boot/dialogs/MainMenu.lua
game/modules/tome/data/general/objects/world-artifacts.lua 4 additions, 4 deletions

game/modules/tome/data/general/objects/world-artifacts.lua
src/web.c 10 additions, 0 deletions

src/web.c

with 19 additions and 4 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