my vcproj
vcproj
mine: add git rev to windows build
mine: rbp tweaks

rbp adjust 2
ADD: JSON-RPC: add a parameter to "Remove" methods allowing to also delete the file
ADD: add advanced settings allowing to customize the items of the "Recently Added" job
ADD: Implement File copy operation on videodb sources

Conflicts:

	project/VS2010Express/XBMC.vcxproj.filters
CHG: Add extension to videodb url's
CHG: refine destination filename when copying from DB
ADD: Export medatadata after copying from videodb
ADD: "Queue from here" context menu; Queue from current item to end of list
ADD: "includeallvideos" advanced setting: add all videos to the library, even if there is no scrapper data
[mine] dvd player error messages
ADD: [droid] Ouya specific stuff
ADD: [droid] Register XBMC as media player
FIX: [droid] fix multitouch
FIX: [droid] proper brodcast receiver manifest name
theuni gist
ADD: [droid] libstagefright dvdplayer hw codec

Conflicts:

	xbmc/android/activity/XBMCApp.cpp
	xbmc/android/activity/XBMCApp.h
ADD: brightness/contrast controls to GLES

Conflicts:

	system/shaders/guishader_frag_oes.glsl