Skip to content

Commit

Permalink
update conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
privatezero committed Dec 14, 2016
1 parent b9b24e6 commit 60a3b2a
Show file tree
Hide file tree
Showing 13 changed files with 1,129 additions and 0 deletions.
48 changes: 48 additions & 0 deletions Pashua.app/Contents/Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>14F1509</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>Pashua</string>
<key>CFBundleIconFile</key>
<string>AppIcon</string>
<key>CFBundleIdentifier</key>
<string>net.bluem.pashua</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>Pash</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<string>0.10.3</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>7A1001</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>10M2423</string>
<key>DTSDKName</key>
<string>macosx10.6</string>
<key>DTXcode</key>
<string>0701</string>
<key>DTXcodeBuild</key>
<string>7A1001</string>
<key>LSUIElement</key>
<false/>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
</dict>
</plist>
Binary file added Pashua.app/Contents/MacOS/Pashua
Binary file not shown.
1 change: 1 addition & 0 deletions Pashua.app/Contents/PkgInfo
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
APPLPash
Binary file added Pashua.app/Contents/Resources/AppIcon.icns
Binary file not shown.
Binary file added Pashua.app/Contents/Resources/AppIcon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pashua.app/Contents/Resources/AppIcon@2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,080 changes: 1,080 additions & 0 deletions Pashua.app/Contents/Resources/Documentation.html

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file added Pashua.app/Contents/Resources/bar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pashua.app/Contents/Resources/bar@2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pashua.app/Contents/Resources/dialog-bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.

0 comments on commit 60a3b2a

Please sign in to comment.