Changeset 11447 for code/trunk
- Timestamp:
- Oct 2, 2017, 2:32:11 PM (7 years ago)
- Location:
- code/trunk
- Files:
-
- 4 edited
- 6 copied
-
. (modified) (view diffs)
-
data/gui/layouts/Dialogue.layout (copied) (copied from code/branches/Dialogue_FS17/data/gui/layouts/Dialogue.layout) (view diffs)
-
data/gui/scripts/Dialogue.lua (copied) (copied from code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua) (view diffs)
-
data/gui/scripts/TestDialogButttons.lua (copied) (copied from code/branches/Dialogue_FS17/data/gui/scripts/TestDialogButttons.lua) (view diffs)
-
data/levels/DialogueShowcase.oxw (copied) (copied from code/branches/Dialogue_FS17/data/levels/DialogueShowcase.oxw) (view diffs)
-
data/levels/events.oxw (modified) (view diffs)
-
data/overlays/HUDTemplates3.oxo (modified) (view diffs)
-
data/tcl/core (copied) (copied from code/branches/Dialogue_FS17/data/tcl/core) (view diffs)
-
src/modules/CMakeLists.txt (modified) (view diffs)
-
src/modules/dialogue (copied) (copied from code/branches/Dialogue_FS17/src/modules/dialogue) (view diffs)
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/Dialogue_FS17 (added) merged: 11360,11371,11377,11382,11384,11390,11393-11394,11401,11406-11408,11413,11415,11417,11421-11422,11428,11432-11433,11435
- Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.
