Permalink
Browse files

Merging

  • Loading branch information...
2 parents 4eaac2e + c401763 commit 263a269fe23c18a78b5093f711e134548d3a3b6e @andrewfb andrewfb committed Mar 3, 2013
@@ -3,23 +3,29 @@
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
- <string>English</string>
+ <string>en</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIconFile</key>
<string>CinderApp.icns</string>
<key>CFBundleIdentifier</key>
- <string>org.libcinder._TBOX_PREFIX_</string>
+ <string>org.libcinder.${PRODUCT_NAME:rfc1034identifier}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.0</string>
+ <string>1</string>
+ <key>LSMinimumSystemVersion</key>
+ <string>${MACOSX_DEPLOYMENT_TARGET}</string>
+ <key>NSHumanReadableCopyright</key>
+ <string>Copyright © 2013 __MyCompanyName__. All rights reserved.</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
@@ -24,7 +24,7 @@
</dict>
</dict>
<key>CFBundleIdentifier</key>
- <string>dongle.${PRODUCT_NAME:rfc1034identifier}</string>
+ <string>org.libcinder.${PRODUCT_NAME:rfc1034identifier}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
@@ -36,7 +36,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.0</string>
+ <string>1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSMainNibFile</key>
@@ -7,9 +7,9 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIconFile</key>
- <string></string>
+ <string>CinderApp.icns</string>
<key>CFBundleIdentifier</key>
- <string>libcinder.org.${PRODUCT_NAME:rfc1034identifier}</string>
+ <string>org.libcinder.${PRODUCT_NAME:rfc1034identifier}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
@@ -25,7 +25,7 @@
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>NSHumanReadableCopyright</key>
- <string>Copyright © 2012 __MyCompanyName__. All rights reserved.</string>
+ <string>Copyright © 2013 __MyCompanyName__. All rights reserved.</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
@@ -5,21 +5,21 @@
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundleDevelopmentRegion</key>
- <string>English</string>
+ <string>en</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
- <string>com.yourcompany.${PRODUCT_NAME:identifier}</string>
+ <string>org.libcinder.${PRODUCT_NAME:rfc1034identifier}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.0</string>
+ <string>1</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>NSPrincipalClass</key>
@@ -159,7 +159,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "_TBOX_PREFIX_" */;
- compatibilityVersion = "Xcode 3.1";
+ compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -157,7 +157,7 @@
00692BC614FF149000D0A05E /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 00692BC914FF149000D0A05E /* Build configuration list for PBXProject "_TBOX_PREFIX_" */;
- compatibilityVersion = "Xcode 3.1";
+ compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
@@ -27,6 +27,10 @@
#include "cinder/CinderMath.h"
#include "cinder/Vector.h"
+#include "cinder/Matrix22.h"
+#include "cinder/Matrix33.h"
+#include "cinder/MatrixAffine2.h"
+
#include <iomanip>
namespace cinder {

0 comments on commit 263a269

Please sign in to comment.