projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_1.9.30] Merge branch 'devel/master'
[platform/core/uifw/dali-core.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
4143a88
..
2912c11
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-5,6
+5,12
@@
Makefile.in
Makefile
BROWSE
Makefile.in
Makefile
BROWSE
+CMakeCache.txt
+CMakeFiles/
+cmake_install.cmake
+dali.info
+install_manifest.txt
+libdali2-core.so*
*~
*.pc
*.o
*~
*.pc
*.o
@@
-32,10
+38,11
@@
BROWSE
*.swp
*.creator
*.creator.user
*.swp
*.creator
*.creator.user
-/automated-tests/CMakeLists.txt
-/automated-tests/src/dali/CMakeLists.txt
/docs/generated/*
/build/tizen/doc
/docs/generated/*
/build/tizen/doc
+/build/tizen-cmake/doc
/build/tizen/.cov
/build/desktop
/packaging/home*
/build/tizen/.cov
/build/desktop
/packaging/home*
+compile_commands.json
+file-list.cmake