merge

Resources/modules/packaging/js/packaging.js

@@ -2145,7 +2145,7 @@ PackageProject.writeTiManifest = function(project)
 		timanifest.platforms.push('linux');
 		linuxTrue = true;
 	}
-	TiDev.track('desktop-package',{win:winTrue,linux:linuxTrue,mac:macTrue});
+	TiDev.track('desktop-package',{win:winTrue,linux:linuxTrue,mac:macTrue,guid:project.guid});
 
 	timanifest.visibility = visibility;
 

manifest

@@ -4,9 +4,8 @@
 #image:titanium_beta.png
 #url:http://www.appcelerator.com
 #guid:2adec37f-e394-479f-8cbb-ac54209818a6
-#desc:Titanium Developer is the application for managing your Titanium Mobile and Desktop applications.
+#desc:Titanium Developer is a cool new app created by Appcelerator
 #type:desktop
-<<<<<<< HEAD:manifest
 runtime:0.7.0
 api:0.7.0
 tiapp:0.7.0
@@ -16,7 +15,10 @@ tiui:0.7.0
 javascript:0.7.0
 tianalytics:0.7.0
 sdk:0.7.0
+mobilesdk:0.7.0
 php:0.7.0
+python:0.7.0
+ruby:0.7.0
 tidatabase:0.7.0
 tidesktop:0.7.0
 tigrowl:0.7.0
@@ -26,26 +28,3 @@ tinetwork:0.7.0
 tinotification:0.7.0
 tiprocess:0.7.0
 tiworker:0.7.0
-=======
-runtime:0.6.0
-api:0.6.0
-tiapp:0.6.0
-tifilesystem:0.6.0
-tiplatform:0.6.0
-tiui:0.6.0
-javascript:0.6.0
-tianalytics:0.6.0
-mobilesdk:0.6.2
-sdk:0.6.0
-python:0.6.0
-ruby:0.6.0
-tidatabase:0.6.0
-tidesktop:0.6.0
-tigrowl:0.6.0
-timedia:0.6.0
-timonkey:0.6.0
-tinetwork:0.6.0
-tinotification:0.6.0
-tiprocess:0.6.0
-tiworker:0.6.0
->>>>>>> abb433feafa5b4c6846307c0508392070788ab91:manifest

tiapp.xml

@@ -2,7 +2,7 @@
 <ti:app xmlns:ti='http://ti.appcelerator.org'>
 <id>com.appcelerator.titanium.developer</id>
 <name>Titanium Developer</name>
-<version>0.7.0</version>
+<version>0.6.2</version>
 <publisher>Appcelerator</publisher>
 <url>http://www.appcelerator.com</url>
 <icon>titanium_beta.png</icon>