Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
TomGrobbe committed Feb 11, 2019
2 parents c079b5e + ccd83c8 commit 16147c3
Show file tree
Hide file tree
Showing 35 changed files with 3,838 additions and 2,647 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -262,3 +262,5 @@ __pycache__/
dependencies/shared/vMenuShared\.net\.dll

external/

*.cmd
Binary file modified dependencies/client/CitizenFX.Core.dll
Binary file not shown.
280 changes: 237 additions & 43 deletions dependencies/client/CitizenFX.Core.xml

Large diffs are not rendered by default.

Binary file modified dependencies/client/MenuAPI.net.dll
Binary file not shown.
Binary file modified dependencies/server/CitizenFX.Core.Server.dll
Binary file not shown.
37 changes: 37 additions & 0 deletions dependencies/server/CitizenFX.Core.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vMenu.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ VisualStudioVersion = 15.0.27130.2020
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vMenuClient", "vMenu\vMenuClient.csproj", "{58FE5D89-E729-4246-B527-6EDA2A1AF04D}"
ProjectSection(ProjectDependencies) = postProject
{897C1141-8CD6-4609-A692-53DAFF9BCBBE} = {897C1141-8CD6-4609-A692-53DAFF9BCBBE}
{CFE8E7CD-EAB0-48A1-A22F-566B048F110D} = {CFE8E7CD-EAB0-48A1-A22F-566B048F110D}
EndProjectSection
EndProject
Expand Down
Loading

0 comments on commit 16147c3

Please sign in to comment.