Merge branch 'develop' of https://github.com/vanillabrain/vanillameta into develop_ivy

This commit is contained in:
lsw
2022-10-11 15:19:18 +09:00
2 changed files with 11 additions and 3 deletions

5
.gitignore vendored
View File

@@ -68,6 +68,11 @@ $RECYCLE.BIN/
# *.iml
# *.ipr
.idea/.gitignore
.idea/misc.xml
.idea/modules.xml
.idea/vcs.xml
# CMake
cmake-build-*/

7
.idea/modules.xml generated
View File

@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/vanillameta_ivy.iml" filepath="$PROJECT_DIR$/.idea/vanillameta_ivy.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/vanillameta.iml" filepath="$PROJECT_DIR$/.idea/vanillameta.iml" />
<module fileurl="file://$PROJECT_DIR$/backend-api/backend-api.iml" filepath="$PROJECT_DIR$/backend-api/backend-api.iml" />
<module fileurl="file://$PROJECT_DIR$/design/design.iml" filepath="$PROJECT_DIR$/design/design.iml" />
<module fileurl="file://$PROJECT_DIR$/docs/docs.iml" filepath="$PROJECT_DIR$/docs/docs.iml" />
<module fileurl="file://$PROJECT_DIR$/frontend-web/frontend-web.iml" filepath="$PROJECT_DIR$/frontend-web/frontend-web.iml" />
</modules>
</component>
</project>