projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge "Fix bug in transition effect" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
4555b92
..
f069b3a
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-78,3
+78,4
@@
dali-toolkit/internal/graphics/generated/*
dali-toolkit/internal/graphics/builtin-shader-extern-gen.h
dali-scene3d/internal/graphics/generated/*
dali-scene3d/internal/graphics/builtin-shader-extern-gen.h
+automated-tests/resources/overwritable-image.jpg
\ No newline at end of file