halx99 449a596f3e Merge: fd2cbdc331 a816a8ac64 ... Merge branch '1.x' into dev # Conflicts: # README.md # README_CN.md # install-pwsh.sh # tools/console/axmol		2023-08-31 17:56:09 +08:00
..
jni	Final migrate (#876)	2022-10-01 16:24:52 +08:00
res	[Android] Update icons to Axmol logo (#1073)	2023-02-23 23:43:51 +08:00
src/org/axmol/cpp	Update project url in sources	2023-03-12 01:44:55 +08:00
.gitignore	Merge: 61c159d3d0 932c3bcffa	2022-06-24 16:23:26 +08:00
AndroidManifest.xml	Final migrate (#876)	2022-10-01 16:24:52 +08:00
build.gradle	Merge: fd2cbdc331 a816a8ac64	2023-08-31 17:56:09 +08:00
proguard-rules.pro	Final migrate (#876)	2022-10-01 16:24:52 +08:00