Commit 439d6f7
Ali Lloyd
Merge branch 'develop' into refactor-syntax_unicode_with_develop_again
Conflicts:
engine/engine-mobile.xcodeproj/project.pbxproj
engine/engine.xcodeproj/project.pbxproj
engine/src/bitmapeffect.cpp
engine/src/buttondraw.cpp
engine/src/customprinter.cpp
engine/src/font.cpp
engine/src/font.h
engine/src/graphic.cpp
engine/src/graphicscontext.cpp
engine/src/graphicscontext.h
engine/src/group.cpp
engine/src/ifile.cpp
engine/src/image.cpp
engine/src/image.h
engine/src/image_rep.cpp
engine/src/image_rep.h
engine/src/image_rep_encoded.cpp
engine/src/lnxpsprinter.cpp
engine/src/object.cpp
engine/src/scrollbardraw.cpp
engine/src/stack.cpp
engine/src/stack.h
engine/src/tooltip.cpp
engine/src/w32dc.cppFile tree
86 files changed
+1804
-6310
lines changed- docs/notes
- engine
- engine-mobile.xcodeproj
- engine.xcodeproj
- src
- libgraphics
- include
- src
- rules
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
86 files changed
+1804
-6310
lines changedThis file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
0 commit comments