Merge branch 'master' of http://172.20.20.19:3000/ft/skyscraper8
# Conflicts: # skyscraper8/Properties/launchSettings.json # skyscraper8/Skyscraper/BbframeDeencapsulator.cs
This commit is contained in:
commit
b943a971ef
@ -2,7 +2,7 @@
|
|||||||
"profiles": {
|
"profiles": {
|
||||||
"skyscraper8": {
|
"skyscraper8": {
|
||||||
"commandName": "Project",
|
"commandName": "Project",
|
||||||
"commandLineArgs": "cscan tcp://127.0.0.1:6969",
|
"commandLineArgs": "satip auto 1 H 11141 S2 23500",
|
||||||
"remoteDebugEnabled": false
|
"remoteDebugEnabled": false
|
||||||
},
|
},
|
||||||
"Container (Dockerfile)": {
|
"Container (Dockerfile)": {
|
||||||
|
|||||||
@ -1,5 +1,4 @@
|
|||||||
using log4net;
|
using skyscraper5.Mpeg2;
|
||||||
using skyscraper5.Mpeg2;
|
|
||||||
using skyscraper5.Skyscraper;
|
using skyscraper5.Skyscraper;
|
||||||
using skyscraper5.Skyscraper.IO;
|
using skyscraper5.Skyscraper.IO;
|
||||||
using System;
|
using System;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user