<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" media="screen" href="/~d/styles/rss2full.xsl"?><?xml-stylesheet type="text/css" media="screen" href="http://feeds.feedburner.com/~d/styles/itemcontent.css"?><rss xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:wfw="http://wellformedweb.org/CommentAPI/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:sy="http://purl.org/rss/1.0/modules/syndication/" xmlns:slash="http://purl.org/rss/1.0/modules/slash/" xmlns:feedburner="http://rssnamespace.org/feedburner/ext/1.0" version="2.0">

<channel>
	<title>shazron.com</title>
	
	<link>http://www.shazron.com</link>
	<description>tech and travel</description>
	<lastBuildDate>Thu, 17 Nov 2011 23:57:40 +0000</lastBuildDate>
	<language>en</language>
	<sy:updatePeriod>hourly</sy:updatePeriod>
	<sy:updateFrequency>1</sy:updateFrequency>
	<generator>http://wordpress.org/?v=3.3.2</generator>
<cloud domain="www.shazron.com" port="80" path="/?rsscloud=notify" registerProcedure="" protocol="http-post" />
		<atom10:link xmlns:atom10="http://www.w3.org/2005/Atom" rel="self" type="application/rss+xml" href="http://feeds.feedburner.com/Shazron" /><feedburner:info uri="shazron" /><atom10:link xmlns:atom10="http://www.w3.org/2005/Atom" rel="hub" href="http://pubsubhubbub.appspot.com/" /><item>
		<title>Google +1 with WordPress (and Jetpack Sharedaddy)</title>
		<link>http://feedproxy.google.com/~r/Shazron/~3/7uTZeFyPtbA/</link>
		<comments>http://www.shazron.com/2011/06/04/google-1-with-wordpress-and-jetpack-sharedaddy/#comments</comments>
		<pubDate>Sat, 04 Jun 2011 23:22:03 +0000</pubDate>
		<dc:creator>shazron</dc:creator>
				<category><![CDATA[Tech]]></category>
		<category><![CDATA[google +1]]></category>
		<category><![CDATA[google plus one]]></category>
		<category><![CDATA[jetpack]]></category>
		<category><![CDATA[plugin]]></category>
		<category><![CDATA[sharedaddy]]></category>
		<category><![CDATA[wordpress]]></category>
		<category><![CDATA[wordpress plugin]]></category>

		<guid isPermaLink="false">http://www.shazron.com/?p=297</guid>
		<description><![CDATA[[UPDATE: JetPack 1.2 released on Nov 17th 2011 has Google Plus support now] Unfortunately the WordPress ShareDaddy plugin (that comes with the Jetpack plugin) does not have Google +1 support currently, and adding it as a custom item does not work. So, I modified one of the .php files from the ShareDaddy plugin to include [...]]]></description>
			<content:encoded><![CDATA[<p><img class="alignleft size-full wp-image-298" title="gplusone-icon" src="http://www.shazron.com/wp-content/uploads/2011/06/gplusone-icon.png" alt="" width="64" height="54" /><strong>[UPDATE: JetPack 1.2 released on Nov 17th 2011 has Google Plus support now] </strong>Unfortunately the WordPress ShareDaddy plugin (that comes with the <a href="http://wordpress.org/extend/plugins/jetpack/">Jetpack</a> plugin) does not have Google +1 support currently, and adding it as a custom item does not work.</p>
<p>So, I modified one of the .php files from the ShareDaddy plugin to include this support. You will need either this plugin [<a href="http://wordpress.org/extend/plugins/google/">1</a>] or this one [<a href="http://wordpress.org/extend/plugins/google-1/">2</a>] installed first, in this example, I am using [<a href="http://wordpress.org/extend/plugins/google/">1</a>], but you can use any one if you know its shortcode.</p>
<p>The additions you need to make are in the sharing-service.php file. The diff is <a href="http://www.shazron.com/wp-content/uploads/2011/06/sharing-service.php_.diff_.txt">here</a>, and this is the <a href="http://www.shazron.com/wp-content/uploads/2011/06/sharing-service.php_.txt">patched sharing-service.php</a> file (from <a href="http://wordpress.org/extend/plugins/jetpack/">Jetpack</a> ShareDaddy 1.1.2) . Below is an image and line location (lines 436-437) for the additions (click to enlarge):</p>
<p><a href="http://www.shazron.com/wp-content/uploads/2011/06/ShareDaddy-GPlusOne.png"><img class="aligncenter size-medium wp-image-299" title="ShareDaddy-GPlusOne" src="http://www.shazron.com/wp-content/uploads/2011/06/ShareDaddy-GPlusOne.png" alt="" width="640" height="125" /></a></p>
<p><script src="https://gist.github.com/1096437.js?file=gistfile1.php"></script></p>
<p>This adds Google +1 to the end of the items shared by ShareDaddy. Change the shortcode to the one that your plugin comes with, I used this plugin [<a href="http://wordpress.org/extend/plugins/google/">1</a>] where the shortcode is &#8216;wgdpo_plusone&#8217;, for the other plugin [<a href="http://wordpress.org/extend/plugins/google-1/">2</a>], the shortcode is &#8216;google1&#8242;.</p>
<p><strong>NOTE:</strong> If you upgrade to 1.1.3, it goes without saying you will have to re-apply the patch.</p>
<img src="http://feeds.feedburner.com/~r/Shazron/~4/7uTZeFyPtbA" height="1" width="1"/>]]></content:encoded>
			<wfw:commentRss>http://www.shazron.com/2011/06/04/google-1-with-wordpress-and-jetpack-sharedaddy/feed/</wfw:commentRss>
		<slash:comments>19</slash:comments>
		<feedburner:origLink>http://www.shazron.com/2011/06/04/google-1-with-wordpress-and-jetpack-sharedaddy/</feedburner:origLink></item>
		<item>
		<title>Going Indie</title>
		<link>http://feedproxy.google.com/~r/Shazron/~3/zO42Lk_ko_A/</link>
		<comments>http://www.shazron.com/2010/10/10/going-indie/#comments</comments>
		<pubDate>Sun, 10 Oct 2010 08:43:25 +0000</pubDate>
		<dc:creator>shazron</dc:creator>
				<category><![CDATA[Tech]]></category>
		<category><![CDATA["OS X"]]></category>
		<category><![CDATA[indie]]></category>
		<category><![CDATA[iOS]]></category>
		<category><![CDATA[mac]]></category>

		<guid isPermaLink="false">http://www.shazron.com/?p=248</guid>
		<description><![CDATA[&#8230; as in independent developer. Great blog posts and videos &#8211; I got the links from a Cocoaheads talk in San Francisco in 2009, during WWDC. I included the original bit.ly links so it would easy to remember (plus the original links just in case the Libyan government cancels the bit.ly domain &#8211; haha) Indie [...]]]></description>
			<content:encoded><![CDATA[<p><img style="float: right; padding-left: 15px; padding-bottom: 20px;" src="http://www.shazron.com/wp-content/uploads/2010/10/fedora.png" border="0" alt="fedora.png" width="200" height="150" /></p>
<p>&#8230; as in independent developer. Great blog posts and videos &#8211; I got the links from a Cocoaheads talk in San Francisco in 2009, during WWDC. I included the original bit.ly links so it would easy to remember (plus the original links just in case the Libyan government cancels the bit.ly domain &#8211; haha)</p>
<ol>
<li> Indie Ethos (video) by <a href="http://rentzsch.com/">Jonathan &#8216;Wolf&#8217; Rentzsch</a> [<a href="http://bit.ly/indie1">http://bit.ly/indie1</a>] [<a href="http://www.viddler.com/explore/rentzsch/videos/3/">original</a>] </li>
<li> How to become an independent programmer in just 1068 days by Gus Mueller of <a href="http://flyingmeat.com">Flying Meat Inc.</a> (maker of <a href="http://flyingmeat.com/acorn/">Acorn</a>, an image editor) [<a href="http://bit.ly/indie2">http://bit.ly/indie2</a>] [<a href="http://www.gusmueller.com/blog/archives/2005/12/25.html">original</a>] </li>
<li> Indie Fever by Daniel Jalkut of <a href="http://www.red-sweater.com/">Red Sweater Software</a> (maker of <a href="http://www.red-sweater.com/marsedit/">MarsEdit</a>, blogging software) [<a href="http://bit.ly/indie3">http://bit.ly/indie3</a>] [<a href="http://www.red-sweater.com/blog/447/indie-fever">original</a>] </li>
<li> Indie Fever by ﻿Michiel van Meeteren for <a href="http://www.madebysofa.com">Sofa</a> (maker of <a href="http://versionsapp.com">Versions</a>, a SVN client) [<a href="http://bit.ly/indie4">http://bit.ly/indie4</a>] [<a href="http://www.madebysofa.com/indiefever/">original</a>]</li>
<li><a href="http://www.viddler.com/explore/rentzsch/videos/32/">Apple to Indie</a> by Buzz Andersen (maker of <a href="http://birdfeedapp.com">BirdFeed</a>, now <a href="http://brizzly.com/iphone">Brizzly</a> &#8211; a Twitter client for the iPhone). Good insights on what goes on inside Apple by a former Apple Engineer&#8217;s perspective.</li>
</ol>
<img src="http://feeds.feedburner.com/~r/Shazron/~4/zO42Lk_ko_A" height="1" width="1"/>]]></content:encoded>
			<wfw:commentRss>http://www.shazron.com/2010/10/10/going-indie/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		<feedburner:origLink>http://www.shazron.com/2010/10/10/going-indie/</feedburner:origLink></item>
		<item>
		<title>Export your device UDIDs from your iPhone Provisioning Portal</title>
		<link>http://feedproxy.google.com/~r/Shazron/~3/9wy8eMWGu9s/</link>
		<comments>http://www.shazron.com/2010/07/31/export-your-device-udids-from-your-iphone-provisioning-portal/#comments</comments>
		<pubDate>Sun, 01 Aug 2010 01:40:00 +0000</pubDate>
		<dc:creator>shazron</dc:creator>
				<category><![CDATA[Tech]]></category>
		<category><![CDATA[ToTwitter]]></category>
		<category><![CDATA[iOS]]></category>
		<category><![CDATA[ipad]]></category>
		<category><![CDATA[iphone]]></category>
		<category><![CDATA[provisioning portal]]></category>
		<category><![CDATA[udid export]]></category>

		<guid isPermaLink="false">http://www.shazron.com/?p=212</guid>
		<description><![CDATA[Well, there is no built in way. I needed to copy a bunch of them from one provisioning portal to another without much grief (it was a client&#8217;s portal, and there was no offline list available). So here&#8217;s what I did. Using Safari on OS X: Log in to your iPhone Provisioning Portal Click on [...]]]></description>
			<content:encoded><![CDATA[<p><a href="http://www.shazron.com/wp-content/uploads/2010/07/iphonepp.png"><img class="alignleft size-full wp-image-216" style="margin-bottom: 50px;" title="iphonepp" src="http://www.shazron.com/wp-content/uploads/2010/07/iphonepp.png" alt="" width="100" height="94" /></a>Well, there is no built in way. I needed to copy a bunch of them from one provisioning portal to another without much grief (it was a client&#8217;s portal, and there was no offline list available). So here&#8217;s what I did. Using Safari on OS X:</p>
<ol>
<li>Log in to your iPhone Provisioning Portal</li>
<li>Click on &#8220;Devices&#8221; in the left sidebar</li>
<li>Click on the &#8220;History&#8221; tab</li>
<li>Select all the items under the column headers, then &#8220;Copy&#8221; to your pasteboard</li>
<li>Launch &#8220;Microsoft Excel 2008&#8243; (tested in Apple&#8217;s Numbers 2.0.5 (368) as well)</li>
<li>Select cell &#8220;A1&#8243;</li>
<li>Paste the contents of the pasteboard in</li>
</ol>
<p>Now all your UDIDs are properly formatted in columns!</p>
<p> </p>
<p>Edit the ones you don&#8217;t need, etc, based on the &#8220;Description&#8221; column. To export the list for another portal, you will need to move the column &#8220;Device ID&#8221; so it is before &#8220;Device Name&#8221;, and remove the other columns. You will need the first row for the column names still (first row is ignored by the importer). Then export the spreadheet as a tab-delimited text file. Now the UDIDs are ready for import.</p>
<img src="http://feeds.feedburner.com/~r/Shazron/~4/9wy8eMWGu9s" height="1" width="1"/>]]></content:encoded>
			<wfw:commentRss>http://www.shazron.com/2010/07/31/export-your-device-udids-from-your-iphone-provisioning-portal/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		<feedburner:origLink>http://www.shazron.com/2010/07/31/export-your-device-udids-from-your-iphone-provisioning-portal/</feedburner:origLink></item>
		<item>
		<title>ProPlayer WordPress plugin HTML 5 video fallback patch</title>
		<link>http://feedproxy.google.com/~r/Shazron/~3/aUeQFdwXBRg/</link>
		<comments>http://www.shazron.com/2010/07/19/proplayer-wordpress-plugin-html-5-video-fallback-patch/#comments</comments>
		<pubDate>Tue, 20 Jul 2010 07:21:22 +0000</pubDate>
		<dc:creator>shazron</dc:creator>
				<category><![CDATA[Tech]]></category>
		<category><![CDATA[flash]]></category>
		<category><![CDATA[html5]]></category>
		<category><![CDATA[patch]]></category>
		<category><![CDATA[proplayer]]></category>
		<category><![CDATA[video tag]]></category>
		<category><![CDATA[wordpress]]></category>
		<category><![CDATA[wordpress plugin]]></category>

		<guid isPermaLink="false">http://www.shazron.com/?p=194</guid>
		<description><![CDATA[The &#60;video&#62; tag is great and all &#8212; but unfortunately fullscreen support is not ubiquitous yet, but support is in the latest versions of Chrome, Firefox and Safari.  It should have been supported when initially implemented (but you&#8217;ll have to trawl through the WHATWG mailing lists to see the arguments for and against). No matter [...]]]></description>
			<content:encoded><![CDATA[<p><a href="http://www.shazron.com/wp-content/uploads/2010/07/wp3-logo.png"><img class="alignleft size-full wp-image-198" style="margin: 5px;" title="wp3-logo" src="http://www.shazron.com/wp-content/uploads/2010/07/wp3-logo.png" alt="" width="51" height="52" /></a>The &lt;video&gt; tag is great and all &#8212; but unfortunately fullscreen support is not ubiquitous yet, but support is in the latest versions of Chrome, Firefox and Safari.  It should have been supported when initially implemented (but you&#8217;ll have to trawl through the WHATWG mailing lists to see the arguments for and against).</p>
<p>No matter &#8211; fullscreen is an important feature, and in my work supporting a non-profit, they needed to have this feature for their members for viewing classes (which may run 1.5 to 2 hrs long), and the &lt;video&gt; tag in its current incarnation then with no fullscreen support just didn&#8217;t cut it.</p>
<p>Considering that most people don&#8217;t upgrade their browsers often, but have Flash installed already &#8211; we still needed a Flash based video player for fullscreen support. People understand most Flash video players with fullscreen buttons (thank YouTube for that), so it was not hard to educate them about this feature. The non-profit uses WordPress, so we settled on Isa Goksu&#8217;s ProPlayer [<a href="http://wordpress.org/extend/plugins/proplayer/">1</a>][<a href="http://isagoksu.com/proplayer-wordpress-plugin/">2</a>] WordPress plugin which allows for customizability.</p>
<p>The problem was that recently, some students wanted iPhone / iPad video playback as well, and with the current Flash player, they were seeing no videos at all. We had already moved to h.264 movie file support in anticipation of this, since it is supported by the Flash player and most browser &lt;video&gt; tag implementations (save Firefox).</p>
<p>I modified the ProPlayer plugin to fallback to using the &lt;video&gt; tag, if Flash is not available. It works great on the iPad and the iPhone 3GS (iOS 4), but on the iPhone 3G (iOS 3.12) it cannot be played, I don&#8217;t know why [<strong>UPDATE</strong>: Looks like the video was encoded using a h.264 profile that the iPhone 3G didn't recognize. iPhone 3G supports h.264 Basic Profile 3.0, later iPhones support High Profile]</p>
<p>Download the patch <a href="/wp-content/uploads/2010/07/pro-player.html5-video.patch.zip">here</a> . The version of the plugin that was patched is 4.7.7 (pro-player.php file only).</p>
<img src="http://feeds.feedburner.com/~r/Shazron/~4/aUeQFdwXBRg" height="1" width="1"/>]]></content:encoded>
			<wfw:commentRss>http://www.shazron.com/2010/07/19/proplayer-wordpress-plugin-html-5-video-fallback-patch/feed/</wfw:commentRss>
		<slash:comments>9</slash:comments>
		<feedburner:origLink>http://www.shazron.com/2010/07/19/proplayer-wordpress-plugin-html-5-video-fallback-patch/</feedburner:origLink></item>
		<item>
		<title>Kernel Switcher for Mac OS X Snow Leopard</title>
		<link>http://feedproxy.google.com/~r/Shazron/~3/Voh51G_A4Ic/</link>
		<comments>http://www.shazron.com/2009/08/31/kernel-switcher-for-mac-os-x-snow-leopard/#comments</comments>
		<pubDate>Mon, 31 Aug 2009 11:47:47 +0000</pubDate>
		<dc:creator>shazron</dc:creator>
				<category><![CDATA[Tech]]></category>
		<category><![CDATA["OS X"]]></category>
		<category><![CDATA[10.6]]></category>
		<category><![CDATA[64-bit kernel]]></category>
		<category><![CDATA[EFI64]]></category>
		<category><![CDATA[K64]]></category>
		<category><![CDATA[mac]]></category>
		<category><![CDATA[snow leopard]]></category>
		<category><![CDATA[switch]]></category>

		<guid isPermaLink="false">http://www.shazron.com/?p=166</guid>
		<description><![CDATA[There are various command line ways to determine whether your machine running Snow Leopard is running the 64 or 32 bit kernel, and also the ability for you to switch kernels. I have gathered all those ways into this GUI utility that will show you what kernel you are currently running, and it will allow [...]]]></description>
			<content:encoded><![CDATA[<p><a href="http://dl.getdropbox.com/u/1017622/kernelswitcher/KernelSwitcher1.0.dmg"><img class="alignleft size-full wp-image-168" style="margin-right: 10px; margin-bottom: 10px;" title="kernelswitcher" src="http://www.shazron.com/wp-content/uploads/2009/08/kernelswitcher.png" alt="kernelswitcher" width="128" height="128" /></a>There are various command line ways to determine whether your machine running Snow Leopard is running the 64 or 32 bit kernel, and also the ability for you to switch kernels. I have gathered all those ways into this GUI utility that will show you what kernel you are currently running, and it will allow you to set what kernel you want to load at the next restart.</p>
<p>If your machine is not EFI64 capable, this utility will not work (it will check at startup). Even if your machine is EFI64 capable (some Mac Minis and MacBooks), the 64-bit kernel will not boot anyway (Apple restriction, apparently).</p>
<p>[UPDATE: <a href="http://www.osxbook.com/blog/2009/08/31/is-your-machine-good-enough-for-snow-leopard-k64/">Possible hack</a> to get your non-sanctioned EFI64 capable machine to load K64, would be a good extension for my utility]</p>
<p>The utility will ask for admin privileges when you save your settings so it can set the boot arguments. To avoid any saving / admin prompts and to just close the window, just click on the red Close button on the window controls).</p>
<p><strong>Download</strong> KernelSwitcher <a href="http://dl.getdropbox.com/u/1017622/kernelswitcher/KernelSwitcher1.0.dmg" target="_self">here</a>. The full source is on <a href="http://github.com/shazron/kernelswitcher">Github</a> with a MIT license.</p>
<p><strong>Screenshot</strong>:</p>
<p><img class="aligncenter size-full wp-image-169" title="KS_Screen" src="http://www.shazron.com/wp-content/uploads/2009/08/KS_Screen.png" alt="KS_Screen" width="403" height="226" /></p>
<img src="http://feeds.feedburner.com/~r/Shazron/~4/Voh51G_A4Ic" height="1" width="1"/>]]></content:encoded>
			<wfw:commentRss>http://www.shazron.com/2009/08/31/kernel-switcher-for-mac-os-x-snow-leopard/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		<feedburner:origLink>http://www.shazron.com/2009/08/31/kernel-switcher-for-mac-os-x-snow-leopard/</feedburner:origLink></item>
		<item>
		<title>Open, edit and save Microsoft Open XML formats (docx, xlsx, pptx) in Office 2003 or Mac Office 2004</title>
		<link>http://feedproxy.google.com/~r/Shazron/~3/ul7vZ_F_tFc/</link>
		<comments>http://www.shazron.com/2008/12/14/open-edit-and-save-microsoft-open-xml-formats-docx-xlsx-pptx-in-office-2003/#comments</comments>
		<pubDate>Sun, 14 Dec 2008 08:25:33 +0000</pubDate>
		<dc:creator>shazron</dc:creator>
				<category><![CDATA[Tech]]></category>

		<guid isPermaLink="false">http://www.shazron.com/?p=135</guid>
		<description><![CDATA[So you have Office 2003 installed in a zillion computers and you need to open those new .docx/.xlsx/.pptx  files? Find out how.]]></description>
			<content:encoded><![CDATA[<p><img class="size-full wp-image-136 alignright" title="4289ae77-4cba-4a75-86f3-9ff96f68e491" src="http://www.shazron.com/wp-content/uploads/2008/12/4289ae77-4cba-4a75-86f3-9ff96f68e491.gif" alt="4289ae77-4cba-4a75-86f3-9ff96f68e491" width="168" height="97" />So you have Office 2003 installed in a zillion computers and you need to open those new .docx/.xlsx/.pptx  files? No need to buy Office 2007&#8230;</p>
<p>Microsoft has given you an &#8220;upgrade&#8221; path, for free:</p>
<p><a href="http://www.microsoft.com/downloads/details.aspx?FamilyID=941b3470-3ae9-4aee-8f43-c6bb74cd1466&amp;DisplayLang=en" target="_self">Microsoft Office Compatibility Pack for Word, Excel, and PowerPoint 2007 File Formats</a></p>
<p>For Mac Office 2004:</p>
<p><a href="http://go.microsoft.com/fwlink/?LinkId=155820">http://go.microsoft.com/fwlink/?LinkId=155820</a></p>
<p>Technorati Tags: <a href="http://technorati.com/tag/open+docx+xlsx+pptx+for+free" rel="tag"> open docx xlsx pptx for free </a></p>
<img src="http://feeds.feedburner.com/~r/Shazron/~4/ul7vZ_F_tFc" height="1" width="1"/>]]></content:encoded>
			<wfw:commentRss>http://www.shazron.com/2008/12/14/open-edit-and-save-microsoft-open-xml-formats-docx-xlsx-pptx-in-office-2003/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		<feedburner:origLink>http://www.shazron.com/2008/12/14/open-edit-and-save-microsoft-open-xml-formats-docx-xlsx-pptx-in-office-2003/</feedburner:origLink></item>
		<item>
		<title>git merge problems</title>
		<link>http://feedproxy.google.com/~r/Shazron/~3/qJyq4stnsVs/</link>
		<comments>http://www.shazron.com/2008/11/30/git-merge-problems/#comments</comments>
		<pubDate>Sun, 30 Nov 2008 08:15:52 +0000</pubDate>
		<dc:creator>shazron</dc:creator>
				<category><![CDATA[Tech]]></category>

		<guid isPermaLink="false">http://www.shazron.com/?p=130</guid>
		<description><![CDATA[When merging, ever get the error message: Error: Entry &#8216;foo&#8217; is notuptodate. Cannot merge. Two possibilities: You may have local changes that are not committed (so commit them!) or undo those changes. You may have a file that has been modified, but the contents have not been changed. ie somehow the file was &#8216;touch&#8217;ed. Thus [...]]]></description>
			<content:encoded><![CDATA[<p><a href="http://www.shazron.com/wp-content/uploads/2008/11/git.jpg"><img class="size-full wp-image-131 alignleft" style="margin-top: 10px; margin-bottom: 10px;" title="git" src="http://www.shazron.com/wp-content/uploads/2008/11/git.jpg" alt="" width="53" height="102" /></a>When merging, ever get the error message: <strong>Error: Entry &#8216;foo&#8217; is notuptodate. Cannot merge.</strong> Two possibilities:</p>
<ol>
<li>You may have local changes that are not committed (so commit them!) or undo those changes.</li>
<li>You may have a file that has been <em>modified</em>, but the contents have not been changed. ie somehow the file was &#8216;touch&#8217;ed. Thus git thinks that the file has been modified because its modification date has changed, but then its hash is still the same because the content hasn&#8217;t changed, so I guess it gets confused. Doing this command below updates the file stats for your repo index to flush out this second possibility:</li>
</ol>
<pre style="padding-left: 90px;"><strong>git update-index --refresh
</strong></pre>
<p>Technorati Tags: <a href="http://technorati.com/tag/git+merge+conflict" rel="tag"> git merge conflict</a></p>
<img src="http://feeds.feedburner.com/~r/Shazron/~4/qJyq4stnsVs" height="1" width="1"/>]]></content:encoded>
			<wfw:commentRss>http://www.shazron.com/2008/11/30/git-merge-problems/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		<feedburner:origLink>http://www.shazron.com/2008/11/30/git-merge-problems/</feedburner:origLink></item>
		<item>
		<title>Adobe AIR 1.5 released, what changed?</title>
		<link>http://feedproxy.google.com/~r/Shazron/~3/1PXWRUuzz54/</link>
		<comments>http://www.shazron.com/2008/11/16/adobe-air-15-released-what-changed/#comments</comments>
		<pubDate>Mon, 17 Nov 2008 05:18:37 +0000</pubDate>
		<dc:creator>shazron</dc:creator>
				<category><![CDATA[Tech]]></category>

		<guid isPermaLink="false">http://www.shazron.com/?p=116</guid>
		<description><![CDATA[Adobe AIR 1.5 has been released today for Mac OS X and Windows. Linux is still at version 1.1. So what&#8217;s changed that I can see so far? I couldn&#8217;t find any release notes (yet). For one thing, Flash Player 10 is now included. For the Mac, its at version 10,0,12,36. For Windows (XP), it&#8217;s at [...]]]></description>
			<content:encoded><![CDATA[<p><img class="alignleft size-medium wp-image-117" style="margin: 5px;" title="air_icon_special" src="http://www.shazron.com/wp-content/uploads/2008/11/air_icon_special.gif" alt="" width="100" height="100" /></p>
<p>Adobe AIR 1.5 has been <a href="http://get.adobe.com/air" target="_blank">released</a> today for Mac OS X and Windows. Linux is still at version 1.1.</p>
<p>So what&#8217;s changed that I can see so far? I couldn&#8217;t find any release notes (yet). For one thing, Flash Player 10 is now included. For the Mac, its at version <strong>10,0,12,36</strong>. For Windows (XP), it&#8217;s at version <strong>10,0,12,37</strong>. It does <strong>not</strong> however, update the Flash plugins for your other browsers.</p>
<p>I also did some Javascript benchmarks using the <a href="http://www2.webkit.org/perf/sunspider-0.9/sunspider.html" target="_blank">SunSpider</a> Javascript benchmark, to see if perhaps AIR 1.5 includes the new Squirrelfish rendering engine for WebKit.</p>
<p>All tests were done on Mac OS X 10.5.5 (the smaller number the better, of course):</p>
<p><em>Safari 3.2</em>  (5525.26.12) &#8212; <strong>6530.0</strong> ms, <a href="http://www2.webkit.org/perf/sunspider-0.9/sunspider-results.html?%7B%223d-cube%22:%5B1231,857,679,602,541%5D,%223d-morph%22:%5B362,419,358,341,353%5D,%223d-raytrace%22:%5B319,406,351,265,293%5D,%22access-binary-trees%22:%5B80,427,76,79,72%5D,%22access-fannkuch%22:%5B245,244,249,249,251%5D,%22access-nbody%22:%5B760,781,533,471,502%5D,%22access-nsieve%22:%5B60,58,60,65,73%5D,%22bitops-3bit-bits-in-byte%22:%5B68,70,65,68,66%5D,%22bitops-bits-in-byte%22:%5B104,100,104,102,108%5D,%22bitops-bitwise-and%22:%5B174,179,192,201,191%5D,%22bitops-nsieve-bits%22:%5B245,256,231,226,235%5D,%22controlflow-recursive%22:%5B88,91,90,89,89%5D,%22crypto-aes%22:%5B94,82,92,103,89%5D,%22crypto-md5%22:%5B165,135,126,114,114%5D,%22crypto-sha1%22:%5B216,166,139,123,127%5D,%22date-format-tofte%22:%5B172,169,174,185,174%5D,%22date-format-xparb%22:%5B220,213,219,214,209%5D,%22math-cordic%22:%5B694,539,480,461,415%5D,%22math-partial-sums%22:%5B675,561,529,512,447%5D,%22math-spectral-norm%22:%5B360,290,262,254,218%5D,%22regexp-dna%22:%5B224,374,222,219,215%5D,%22string-base64%22:%5B170,177,164,166,179%5D,%22string-fasta%22:%5B227,224,233,217,209%5D,%22string-tagcloud%22:%5B172,170,169,168,171%5D,%22string-unpack-code%22:%5B174,213,177,175,177%5D,%22string-validate-input%22:%5B201,217,189,183,199%5D%7D" target="_blank">result</a></p>
<p><em>FireFox 3.03</em> &#8212; <strong>3211.6</strong> ms, <a href="http://www2.webkit.org/perf/sunspider-0.9/sunspider-results.html?%7B%223d-cube%22:%5B154,144,148,149,158%5D,%223d-morph%22:%5B124,122,127,119,117%5D,%223d-raytrace%22:%5B172,129,126,137,128%5D,%22access-binary-trees%22:%5B50,52,51,55,55%5D,%22access-fannkuch%22:%5B168,167,166,164,171%5D,%22access-nbody%22:%5B158,154,154,154,170%5D,%22access-nsieve%22:%5B65,55,56,55,56%5D,%22bitops-3bit-bits-in-byte%22:%5B57,46,49,47,47%5D,%22bitops-bits-in-byte%22:%5B75,78,78,76,74%5D,%22bitops-bitwise-and%22:%5B86,84,79,83,81%5D,%22bitops-nsieve-bits%22:%5B98,102,103,100,100%5D,%22controlflow-recursive%22:%5B37,43,40,43,39%5D,%22crypto-aes%22:%5B77,74,77,83,76%5D,%22crypto-md5%22:%5B66,55,54,54,66%5D,%22crypto-sha1%22:%5B54,57,58,60,54%5D,%22date-format-tofte%22:%5B227,229,225,231,225%5D,%22date-format-xparb%22:%5B158,157,156,158,153%5D,%22math-cordic%22:%5B138,143,152,144,138%5D,%22math-partial-sums%22:%5B147,150,143,142,141%5D,%22math-spectral-norm%22:%5B71,61,59,58,65%5D,%22regexp-dna%22:%5B281,283,281,277,284%5D,%22string-base64%22:%5B89,91,90,89,98%5D,%22string-fasta%22:%5B208,211,221,209,216%5D,%22string-tagcloud%22:%5B167,166,168,167,167%5D,%22string-unpack-code%22:%5B219,220,222,221,225%5D,%22string-validate-input%22:%5B117,121,114,113,112%5D%7D" target="_blank">result</a></p>
<p><em>Adobe AIR 1.5 WebKit</em> &#8212; <strong>2523.6</strong> ms, <a href="http://www2.webkit.org/perf/sunspider-0.9/sunspider-results.html?%7B%223d-cube%22:%5B132,118,118,119,116%5D,%223d-morph%22:%5B117,111,102,107,103%5D,%223d-raytrace%22:%5B123,120,130,117,118%5D,%22access-binary-trees%22:%5B52,68,51,52,63%5D,%22access-fannkuch%22:%5B113,118,118,116,123%5D,%22access-nbody%22:%5B176,182,184,175,180%5D,%22access-nsieve%22:%5B36,36,30,33,34%5D,%22bitops-3bit-bits-in-byte%22:%5B32,32,33,31,30%5D,%22bitops-bits-in-byte%22:%5B40,42,42,45,44%5D,%22bitops-bitwise-and%22:%5B84,86,87,83,85%5D,%22bitops-nsieve-bits%22:%5B95,90,82,81,85%5D,%22controlflow-recursive%22:%5B30,35,30,31,30%5D,%22crypto-aes%22:%5B61,57,55,60,56%5D,%22crypto-md5%22:%5B51,57,52,53,51%5D,%22crypto-sha1%22:%5B54,48,50,65,52%5D,%22date-format-tofte%22:%5B144,137,145,136,138%5D,%22date-format-xparb%22:%5B89,89,97,90,90%5D,%22math-cordic%22:%5B102,90,99,91,93%5D,%22math-partial-sums%22:%5B138,138,139,134,143%5D,%22math-spectral-norm%22:%5B66,55,56,55,51%5D,%22regexp-dna%22:%5B220,221,235,225,224%5D,%22string-base64%22:%5B91,95,110,111,102%5D,%22string-fasta%22:%5B103,102,118,103,111%5D,%22string-tagcloud%22:%5B137,133,155,138,134%5D,%22string-unpack-code%22:%5B136,139,145,137,137%5D,%22string-validate-input%22:%5B112,109,119,105,108%5D%7D" target="_blank">result</a></p>
<p>According to my results, Adobe AIR 1.5 WebKit&#8217;s Javascript is approximately <strong>2.59x</strong> faster than Safari 3.2, and approximately <strong>1.27x</strong> faster than Firefox 3.03. So is it Squirrelfish? Likely. Extreme? Maybe.</p>
<p>According to the <a href="http://webkit.org/blog/214/introducing-squirrelfish-extreme/" target="_blank">Surfin Safari Blog</a> (for WebKit), Squirrelfish Extreme in the nightly builds is about 3.38x faster than Safari 3.1. But since I have Safari 3.2, I guess that&#8217;s close enough? It can&#8217;t be Squirrelfish (plain) because Squirrelfish non-extreme is only 1.59x as fast as WebKit 3.1. But then it can be just general Javascript improvements as detailed in a blog post by John Gruber on <a href="http://daringfireball.net/2008/07/not_yet_squirrelly" target="_blank">Daring Fireball</a>, so who knows?!</p>
<p>Here&#8217;s the user-agent for Adobe AIR 1.5 WebKit (Mac):<br />
<em><span style="color: #0000ff;">Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.1.2 Safari/525.21</span></em></p>
<p>All the version numbers in the AIR 1.5 user-agent are older than Safari 3.2 (Mac) though, which is:<br />
<em><span style="color: #0000ff;">Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_5; en-us) AppleWebKit/525.26.2 (KHTML, like Gecko) Version/3.2 Safari/525.26.12</span></em></p>
<p>So the evidence is inconclusive for Squirrelfish. Still no SVG support in Adobe AIR 1.5 WebKit though, no surprise there <img src='http://www.shazron.com/wp-includes/images/smilies/icon_razz.gif' alt=':P' class='wp-smiley' /> </p>
<p><strong>(UPDATE):</strong> According to this new <a href="http://www.adobe.com/devnet/logged_in/rchristensen_lpolanco_air_1.5.html" target="_blank">Adobe blog post</a>, Adobe AIR 1.5 includes Squirrelfish, but does not mention the Extreme variant.</p>
<p>Technorati Tags: <a href="http://technorati.com/tag/Adobe+AIR+1.5" rel="tag"> Adobe AIR 1.5</a>, <a href="http://technorati.com/tag/changes" rel="tag"> changes</a>, <a href="http://technorati.com/tag/squirrelfish" rel="tag"> squirrelfish </a></p>
<img src="http://feeds.feedburner.com/~r/Shazron/~4/1PXWRUuzz54" height="1" width="1"/>]]></content:encoded>
			<wfw:commentRss>http://www.shazron.com/2008/11/16/adobe-air-15-released-what-changed/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		<feedburner:origLink>http://www.shazron.com/2008/11/16/adobe-air-15-released-what-changed/</feedburner:origLink></item>
		<item>
		<title>Quicktime on Safari – Question Mark</title>
		<link>http://feedproxy.google.com/~r/Shazron/~3/VzqOj6mf8OA/</link>
		<comments>http://www.shazron.com/2008/07/08/quicktime-on-safari-question-mark/#comments</comments>
		<pubDate>Tue, 08 Jul 2008 15:57:40 +0000</pubDate>
		<dc:creator>shazron</dc:creator>
				<category><![CDATA[Tech]]></category>

		<guid isPermaLink="false">http://www.shazron.com/?p=96</guid>
		<description><![CDATA[Ok, I don&#8217;t know what it is with my OS X install lately after installing OS update 10.5.4 but things seem to be broken left and right. Besides the trash issue in a previous post, Quicktime movies will not play in Safari &#8211; but they do play in Firefox. I updated to the latest Quicktime [...]]]></description>
			<content:encoded><![CDATA[<p>Ok, I don&#8217;t know what it is with my OS X install lately after installing OS update 10.5.4 but things seem to be broken left and right. Besides the trash issue in a previous post, Quicktime movies will not play in Safari &#8211; but they do play in Firefox. I updated to the latest Quicktime (7.5) and still no go after a restart. After trawling through numerous support forums, this is what worked for me:</p>
<ol>
<li>Navigate to the &#8220;/Library/Internet Plug-Ins&#8221; folder</li>
<li>Delete the &#8220;QuickTime Plugin.webplugin&#8221; file</li>
<li>Restart Safari</li>
</ol>
<p>Go to <a href="http://www.apple.com/trailers">http://www.apple.com/trailers</a> to test.</p>
<p> </p>
<p>Technorati Tags: <a href="http://technorati.com/tag/quicktime+question+mark" rel="tag"> quicktime question mark</a>, <a href="http://technorati.com/tag/safari" rel="tag"> safari </a></p>
<img src="http://feeds.feedburner.com/~r/Shazron/~4/VzqOj6mf8OA" height="1" width="1"/>]]></content:encoded>
			<wfw:commentRss>http://www.shazron.com/2008/07/08/quicktime-on-safari-question-mark/feed/</wfw:commentRss>
		<slash:comments>2</slash:comments>
		<feedburner:origLink>http://www.shazron.com/2008/07/08/quicktime-on-safari-question-mark/</feedburner:origLink></item>
		<item>
		<title>Mac OS X – Files won’t go in the Trash</title>
		<link>http://feedproxy.google.com/~r/Shazron/~3/_Lt4CrfpEss/</link>
		<comments>http://www.shazron.com/2008/07/07/mac-os-x-files-wont-go-in-the-trash/#comments</comments>
		<pubDate>Tue, 08 Jul 2008 06:31:37 +0000</pubDate>
		<dc:creator>shazron</dc:creator>
				<category><![CDATA[Tech]]></category>

		<guid isPermaLink="false">http://www.shazron.com/?p=95</guid>
		<description><![CDATA[Most likely your Trash folder is not owned by you anymore. To fix: Open Terminal.app, and type in the next 3 commands: sudo chown &#60;your_user_name&#62;:staff ~/.Trash sudo chmod 700 ~/.Trash killall Finder Technorati Tags: empty trash immediately, mac os x]]></description>
			<content:encoded><![CDATA[<p>Most likely your Trash folder is not owned by you anymore. To fix:</p>
<ol>
<li>Open Terminal.app, and type in the next 3 commands:</li>
<li>sudo chown &lt;your_user_name&gt;:staff ~/.Trash</li>
<li>sudo chmod 700 ~/.Trash</li>
<li>killall Finder</li>
</ol>
<div><p>Technorati Tags: <a href="http://technorati.com/tag/empty+trash+immediately" rel="tag"> empty trash immediately</a>, <a href="http://technorati.com/tag/mac+os+x" rel="tag"> mac os x </a></p></div>
<img src="http://feeds.feedburner.com/~r/Shazron/~4/_Lt4CrfpEss" height="1" width="1"/>]]></content:encoded>
			<wfw:commentRss>http://www.shazron.com/2008/07/07/mac-os-x-files-wont-go-in-the-trash/feed/</wfw:commentRss>
		<slash:comments>2</slash:comments>
		<feedburner:origLink>http://www.shazron.com/2008/07/07/mac-os-x-files-wont-go-in-the-trash/</feedburner:origLink></item>
	</channel>
</rss>

