Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merging

  • Loading branch information...
commit 263a269fe23c18a78b5093f711e134548d3a3b6e 2 parents 4eaac2e + c401763
Andrew Bell authored March 02, 2013
12  blocks/__AppTemplates/BasicApp/OpenGL/xcode/Info.plist
@@ -3,23 +3,29 @@
3 3
 <plist version="1.0">
4 4
 <dict>
5 5
 	<key>CFBundleDevelopmentRegion</key>
6  
-	<string>English</string>
  6
+	<string>en</string>
7 7
 	<key>CFBundleExecutable</key>
8 8
 	<string>${EXECUTABLE_NAME}</string>
9 9
 	<key>CFBundleIconFile</key>
10 10
 	<string>CinderApp.icns</string>
11 11
 	<key>CFBundleIdentifier</key>
12  
-	<string>org.libcinder._TBOX_PREFIX_</string>
  12
+	<string>org.libcinder.${PRODUCT_NAME:rfc1034identifier}</string>
13 13
 	<key>CFBundleInfoDictionaryVersion</key>
14 14
 	<string>6.0</string>
15 15
 	<key>CFBundleName</key>
16 16
 	<string>${PRODUCT_NAME}</string>
17 17
 	<key>CFBundlePackageType</key>
18 18
 	<string>APPL</string>
  19
+	<key>CFBundleShortVersionString</key>
  20
+	<string>1.0</string>
19 21
 	<key>CFBundleSignature</key>
20 22
 	<string>????</string>
21 23
 	<key>CFBundleVersion</key>
22  
-	<string>1.0</string>
  24
+	<string>1</string>
  25
+	<key>LSMinimumSystemVersion</key>
  26
+	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
  27
+	<key>NSHumanReadableCopyright</key>
  28
+	<string>Copyright © 2013 __MyCompanyName__. All rights reserved.</string>
23 29
 	<key>NSMainNibFile</key>
24 30
 	<string>MainMenu</string>
25 31
 	<key>NSPrincipalClass</key>
4  blocks/__AppTemplates/BasicApp/OpenGL/xcode_ios/Info.plist
@@ -24,7 +24,7 @@
24 24
 		</dict>
25 25
 	</dict>	
26 26
 	<key>CFBundleIdentifier</key>
27  
-	<string>dongle.${PRODUCT_NAME:rfc1034identifier}</string>
  27
+	<string>org.libcinder.${PRODUCT_NAME:rfc1034identifier}</string>
28 28
 	<key>CFBundleInfoDictionaryVersion</key>
29 29
 	<string>6.0</string>
30 30
 	<key>CFBundleName</key>
@@ -36,7 +36,7 @@
36 36
 	<key>CFBundleSignature</key>
37 37
 	<string>????</string>
38 38
 	<key>CFBundleVersion</key>
39  
-	<string>1.0</string>
  39
+	<string>1</string>
40 40
 	<key>LSRequiresIPhoneOS</key>
41 41
 	<true/>
42 42
 	<key>NSMainNibFile</key>
6  blocks/__AppTemplates/CocoaView/OpenGL/xcode/Info.plist
@@ -7,9 +7,9 @@
7 7
 	<key>CFBundleExecutable</key>
8 8
 	<string>${EXECUTABLE_NAME}</string>
9 9
 	<key>CFBundleIconFile</key>
10  
-	<string></string>
  10
+	<string>CinderApp.icns</string>
11 11
 	<key>CFBundleIdentifier</key>
12  
-	<string>libcinder.org.${PRODUCT_NAME:rfc1034identifier}</string>
  12
+	<string>org.libcinder.${PRODUCT_NAME:rfc1034identifier}</string>
13 13
 	<key>CFBundleInfoDictionaryVersion</key>
14 14
 	<string>6.0</string>
15 15
 	<key>CFBundleName</key>
@@ -25,7 +25,7 @@
25 25
 	<key>LSMinimumSystemVersion</key>
26 26
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
27 27
 	<key>NSHumanReadableCopyright</key>
28  
-	<string>Copyright © 2012 __MyCompanyName__. All rights reserved.</string>
  28
+	<string>Copyright © 2013 __MyCompanyName__. All rights reserved.</string>
29 29
 	<key>NSMainNibFile</key>
30 30
 	<string>MainMenu</string>
31 31
 	<key>NSPrincipalClass</key>
6  blocks/__AppTemplates/ScreenSaver/OpenGL/xcode/Info.plist
@@ -5,13 +5,13 @@
5 5
 	<key>CFBundleName</key>
6 6
 	<string>${PRODUCT_NAME}</string>
7 7
 	<key>CFBundleDevelopmentRegion</key>
8  
-	<string>English</string>
  8
+	<string>en</string>
9 9
 	<key>CFBundleExecutable</key>
10 10
 	<string>${EXECUTABLE_NAME}</string>
11 11
 	<key>CFBundleIconFile</key>
12 12
 	<string></string>
13 13
 	<key>CFBundleIdentifier</key>
14  
-	<string>com.yourcompany.${PRODUCT_NAME:identifier}</string>
  14
+	<string>org.libcinder.${PRODUCT_NAME:rfc1034identifier}</string>
15 15
 	<key>CFBundleInfoDictionaryVersion</key>
16 16
 	<string>6.0</string>
17 17
 	<key>CFBundlePackageType</key>
@@ -19,7 +19,7 @@
19 19
 	<key>CFBundleSignature</key>
20 20
 	<string>????</string>
21 21
 	<key>CFBundleVersion</key>
22  
-	<string>1.0</string>
  22
+	<string>1</string>
23 23
 	<key>CFBundleShortVersionString</key>
24 24
 	<string>1.0</string>
25 25
 	<key>NSPrincipalClass</key>
2  blocks/__AppTemplates/__Foundation/xcode/project.pbxproj
@@ -159,7 +159,7 @@
159 159
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
160 160
 			isa = PBXProject;
161 161
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "_TBOX_PREFIX_" */;
162  
-			compatibilityVersion = "Xcode 3.1";
  162
+			compatibilityVersion = "Xcode 3.2";
163 163
 			developmentRegion = English;
164 164
 			hasScannedForEncodings = 1;
165 165
 			knownRegions = (
2  blocks/__AppTemplates/__Foundation/xcode_ios/project.pbxproj
@@ -157,7 +157,7 @@
157 157
 		00692BC614FF149000D0A05E /* Project object */ = {
158 158
 			isa = PBXProject;
159 159
 			buildConfigurationList = 00692BC914FF149000D0A05E /* Build configuration list for PBXProject "_TBOX_PREFIX_" */;
160  
-			compatibilityVersion = "Xcode 3.1";
  160
+			compatibilityVersion = "Xcode 3.2";
161 161
 			developmentRegion = English;
162 162
 			hasScannedForEncodings = 0;
163 163
 			knownRegions = (
4  include/cinder/Matrix44.h
@@ -27,6 +27,10 @@
27 27
 #include "cinder/CinderMath.h"
28 28
 #include "cinder/Vector.h"
29 29
 
  30
+#include "cinder/Matrix22.h"
  31
+#include "cinder/Matrix33.h"
  32
+#include "cinder/MatrixAffine2.h"
  33
+
30 34
 #include <iomanip>
31 35
 
32 36
 namespace cinder { 

0 notes on commit 263a269

Please sign in to comment.
Something went wrong with that request. Please try again.