Skip to content

Commit

Permalink
Merge branch 'x-plane12' into xp12_release
Browse files Browse the repository at this point in the history
# Conflicts:
#	objects/dromader.blend

Signed-off-by: todirbg <todirbg@yahoo.com>
  • Loading branch information
todirbg committed Oct 26, 2022
2 parents bf38efb + 7898e30 commit a0322df
Show file tree
Hide file tree
Showing 9 changed files with 347 additions and 390 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ fmod/
plugins/xlua/scripts/Dromader
StackTracePlus.lua
init_debug.lua
Dromader_clist.txt
Loading

0 comments on commit a0322df

Please sign in to comment.