merge with trunk
authorbobo1on1 <bobo1on1@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Wed, 28 Apr 2010 12:27:22 +0000 (12:27 +0000)
committerbobo1on1 <bobo1on1@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Wed, 28 Apr 2010 12:27:22 +0000 (12:27 +0000)
commit41bad584e2d6b3d75e374f7f841cdd3e9c9ec425
treeed633a24f628c118b13276a5b0ebb44ad357a20d
parent05a8049185511474931b13b6c11981fdeb3a5347
merge with trunk

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/boblight@29605 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
addons/org.xbmc.addons.confluence/description.xml [new file with mode: 0644]
addons/org.xbmc.addons.pm3-hd/description.xml [new file with mode: 0644]
xbmc/addons/AddonManager.cpp
xbmc/osx/CocoaInterface.h
xbmc/osx/CocoaInterface.mm