Make a diff!
When I tried updating homebrew/brew, the following error occurred:
brew update: The following untracked working tree files would be overwritten by merge
# cd /usr/local
# git fetch origin
# git reset --hard origin/master
as explained in the second answer, solved it. Source:
All in all, after several months of using it, I can strongly recommend the B & W Zeppelin Air. It’s a truly great iPod/iPhone speaker, filling even larger rooms with quite impressive depths and crisp heights. And in contrast to its competitors (e.g. think of the lousy hardware of the otherwise innovative Sonos speakers – what a pity!), you can see, feel and hear its excellent build quality. It’s been engineered by the guys who equip the famous Abbey Road Studios, supply the audio system for Jaguars and invented extravagant speakers like the Nautilus, after all.
The only thing which wasn’t satisfying so far, is the Zeppelin Air’s buggy default (software) implementation of Airplay, i.e. that the Zeppelin Air lost the Wifi connection after a while in stand-by mode. As I finally found out, all that’s needed to fix this is a firmware upgrade to version 2.00.24 [updated 20120930]. At least, my Zeppelin Air hasn’t ever lost its Wifi connection anymore since. So, if you experience Wifi connectivity issues with your Zeppelin Air (likely), don’t hesitate and upgrade the Zeppelin’s firmware now, although it’s somewhat cumbersome (you need a suitable USB cable, e.g. from an external hard drive or printer, as this isn’t included in spite of the Zeppelin’s upmarket price). It’s well worth it!
“MagicPrefs is a free application for OS X which aims to improve the functionality and configuration options of the Apple Magic Mouse, Magic Trackpad and the MacBook glass trackpad.
It features the ability to bind a variable number of finger clicks, taps, swipes, pinch and other gestures to functions like Middle Click, Hold Down Both Mouse Buttons, Spaces, Expose, Dashboard, Recent Applications, Tweet, Read Tweets, Google Reader etc.”
A must-have.
Eliot from the SaltyCrane blog wrote a nice Django management command that allows to easily trace a Django runserver simply by executing ./manage.py trace runserver. Works great!
Django trace tool, django-trace is [..] a Django management command that uses sys.settrace with other Django management commands. https://github.com/saltycrane/django-trace.
via Notes on tracing code execution in Django and Python « SaltyCrane Blog.
Das Samsung Audio Dock DA-E750 ist das erste Audio-Device mit integrierter Docking Funktion, das über ein einzigartiges Dual Dock System verfügt. [..]
Darüber hinaus „verbindet“ das Samsung Audio Dock DA-E750 auch kabellos – und zwar nicht nur mit dem Samsung Galaxy S II und Galaxy Note über AllShare. Auch Apple iPod, iPhone und iPad können sich barrierefrei über AirPlay andocken. [..]
Der gute Ton macht die Musik
Für audiophile Enthusiasten spielt das DA-E750 alle Stücke. Das Gerät ist mit Samsungs exklusiver Hybrid-Technologie an Röhrenverstärkern ausgestattet. Sie erzeugt die, für diese Verstärkertechnik typischen, klaren und warmen Klänge. Das 2.1-Soundsystem samt integriertem Subwoofer sorgt für 100 Watt sattem Sound. Das Samsung Audio Dock ist aber nicht nur für die Ohren, sondern auch für die Augen konzipiert. Die Lautsprecher sind aus Fieberglas gefertigt. Das Dock selbst verbirgt sich kaum sichtbar im Hintergrund und die Oberfläche aus Holz verleiht dem Produkt ein elegantes Auftreten.
via Offen für Neues? Samsung Audio Dock DA-E750 verbindet
Would like to listen to it to compare it to other high-end Airplay iPhone/iPod/iPad docks like the B&W Zeppelin Air.
The Samsung DA-E750 isn’t a steal, but considering the high-quality components and manufacturing, a price of around 700 CHF seems reasonable.
Belkin’s stylish Zero Stand is the ultimate solution for your MacBook or MacBook Pro, providing an optimal viewing angle for comfortable, everyday use.
- Rubber grip keeps laptop in place
- Open design improves airflow
- Clutter-free cable management
- Easy to assemble
via Belkin Zero Stand for MacBook Pro – Apple Store (U.S.).
Haven’t tried it yet with my 13″ MacBook Air, but this stand seems to be pretty good (though expensive) according to reviews (youtube video).
Headquake® by Sonic Emotion Absolute 3D offers the listening experience on the go. Headquake is the world’s premier sound enhancement app out there that takes you to another dimension! Listen to your iTunes library of music in a never before heard quality, that is personalized to your favorite type of headphones. You will listen to music as if you were there live and not wearing headphones!
Headquake is plug and play. The app will automatically sync your iTunes music so all you need to do is press play and enjoy!
Headquake is available with unlimited use at $.99.
Sonic Emotion Absolute 3D Sound – the listening experience for all consumer audio products.
The depth that Headquake adds to a plain stereo signal is amazing. When listening to music on my iPhone I always use Headquake, if possible.
Shades is a FREE utility for controlling the brightness of your screen. It runs in the background providing always-available fine-grained control over the brightness of your display via a slick Mac-like interface
via Shades | Software | Charcoal Design.
My new Thunderbolt Apple Display seemed to be rather dark, compared to other displays and what I expected. Thanks to the Shades app I then found out that the display had a factory brightness setting of only about 50% of its maximum brightness. Shades now lets me control the Apple Display’s brightness.
Scroll Reverser is a free app for Mac OS X that reverses the direction of scrolling. You can use it with OS X Tiger, Leopard and Snow Leopard to make your scrolling match the ‘natural scrolling’ in Lion.
via Scroll Reverser for Mac OS X.
I use it on Mac OS X Lion in order to use natural scrolling with the trackpad of my MacBook Air and unnatural scrolling with the attached mouse.
(kudos to @romeroabelleira for the hint)
Recently, my good old HP 48G calculator (one of the best calculators ever built and my longtime personal favourite till today) started displaying the following message whenever I switched it on:
Warning: Invalid Card Data
Which seems a bit odd at first, considering the 48G model has no card slot (only the 48GX model has one). Luckily, there’s a simple solution: Execute the PINIT command by typing “PINIT” (without the double quotes) and pressing the ENTER key.
There’s a great, detailed explanation of this problem and the according fix in the “invalid card data at my hp48g” thread over at the independent HP calculator museum. If this warning message appears on a HP 48GX and the problem persists after applying this fix, take a look at step 3 described in the article titled “Message, Invalid Card Data, is Displayed when the Calculator is Turned On” on HP’s support forum.
Wouldn’t it be a pity if a company with such a great history and so many great hardware products ceased to be a hardware company?