git remote add ssk ../SignalServiceKit git remote update git merge -s ours --allow-unrelated-histories --no-commit ssk/master git read-tree --prefix=SignalServiceKit -u ssk/master git commit
14 lines
261 B
Objective-C
14 lines
261 B
Objective-C
//
|
|
// main.m
|
|
// TSKitOSXTestApp
|
|
//
|
|
// Created by Frederic Jacobs on 06/12/15.
|
|
// Copyright © 2015 Open Whisper Systems. All rights reserved.
|
|
//
|
|
|
|
#import <Cocoa/Cocoa.h>
|
|
|
|
int main(int argc, const char * argv[]) {
|
|
return NSApplicationMain(argc, argv);
|
|
}
|