Kilian/DOCSIS-Toolkit
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.hofmannnet.myhome-server.de/Kilian/DOCSIS-Toolkit

Browse Source 
# Conflicts:
#	Docsis Toolkit.xcodeproj/project.pbxproj
#	Docsis Toolkit.xcodeproj/xcshareddata/xcschemes/All.xcscheme
#	Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Converter.xcscheme
#	Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Graphic Analysis 2.xcscheme
#	Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Logger4.xcscheme
#	Graphic Analysis 2/Info.plist
#	Graphic Analysis 2/buildnum.ver
This commit is contained in:
Kilian Hofmann
2020-11-02 12:19:50 +01:00
parent bd18f9996e fe13d1c739
commit 3964c0978e
10 changed files with 65 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Graphic Analysis 2/Info.plist
+4
View File
@@ -44,7 +44,11 @@
<key>CFBundleShortVersionString</key>
<string>2.1</string>
<key>CFBundleVersion</key>
<<<<<<< HEAD
<string>500</string>
=======
<string>499</string>
>>>>>>> fe13d1c73951c5cae7f44dd2147bdbe028163299
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key>
Graphic Analysis 2/buildnum.ver
+4
View File
@@ -1,2 +1,6 @@
version 2.1
<<<<<<< HEAD
build 500
=======
build 499
>>>>>>> fe13d1c73951c5cae7f44dd2147bdbe028163299