Commit 09f86ee
committed
build: .cproject and .project is renamed to .cproject.default and .project.default
These files were constantly overwritten by the IDE causing merge conflicts.
They moved to xxx.default and these files are copied/moved to .project and .cproject
either on the distro creation or when setenv is sourced and .project or .cproject does
not exists yet.
This will prevent constant overwrite as these files are no longe rpart of the repo
and they are .gitignored1 parent 721e1c6 commit 09f86ee
5 files changed
Lines changed: 13 additions & 0 deletions
File renamed without changes.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
105 | 105 | | |
106 | 106 | | |
107 | 107 | | |
| 108 | + | |
| 109 | + | |
File renamed without changes.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
| 45 | + | |
45 | 46 | | |
46 | 47 | | |
47 | 48 | | |
| |||
50 | 51 | | |
51 | 52 | | |
52 | 53 | | |
| 54 | + | |
| 55 | + | |
53 | 56 | | |
54 | 57 | | |
55 | 58 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
44 | 52 | | |
45 | 53 | | |
46 | 54 | | |
| |||
0 commit comments