Commit [05165e] Maximize Restore History

Merge branch 'master' of ssh://git.code.sf.net/p/lejos/ev3sdcard

Conflicts:
sdcard/lejosimage.zip

gloomyandy gloomyandy 2014-05-01

added kernel/linux-03.20.00.13/arch/arm/mach-davinci/d_sound.h
added modules/lms2012/d_sound/Linuxmod_AM1808/d_sound.h
changed sdcard/lejosimage.zip
changed sdcard/setup.sh
changed kernel/linux-03.20.00.13/arch/arm/mach-davinci/include/mach/entry-macro.S
changed kernel/linux-03.20.00.13/arch/arm/mach-davinci/cp_intc.c
changed kernel/linux-03.20.00.13/arch/arm/mach-davinci/da850.c
changed kernel/linux-03.20.00.13/arch/arm/mach-davinci/davinci-iic.c
changed kernel/linux-03.20.00.13/arch/arm/mach-davinci/time.c
changed modules/lms2012/d_sound/Linuxmod_AM1808/d_sound.c
changed sdcard/scripts/update_sdcard.sh
changed sdcard/lejosimage.zip
changed sdcard/setup.sh
kernel/linux-03.20.00.13/arch/arm/mach-davinci/d_sound.h Diff Switch to side-by-side view
Loading...
modules/lms2012/d_sound/Linuxmod_AM1808/d_sound.h Diff Switch to side-by-side view
Loading...
sdcard/lejosimage.zip Diff Switch to side-by-side view
Loading...
sdcard/setup.sh Diff Switch to side-by-side view
Loading...
kernel/linux-03.20.00.13/arch/arm/mach-davinci/include/mach/entry-macro.S Diff Switch to side-by-side view
Loading...
kernel/linux-03.20.00.13/arch/arm/mach-davinci/cp_intc.c Diff Switch to side-by-side view
Loading...
kernel/linux-03.20.00.13/arch/arm/mach-davinci/da850.c Diff Switch to side-by-side view
Loading...
kernel/linux-03.20.00.13/arch/arm/mach-davinci/davinci-iic.c Diff Switch to side-by-side view
Loading...
kernel/linux-03.20.00.13/arch/arm/mach-davinci/time.c Diff Switch to side-by-side view
Loading...
modules/lms2012/d_sound/Linuxmod_AM1808/d_sound.c Diff Switch to side-by-side view
Loading...
sdcard/scripts/update_sdcard.sh Diff Switch to side-by-side view
Loading...
sdcard/lejosimage.zip Diff Switch to side-by-side view
Loading...
sdcard/setup.sh Diff Switch to side-by-side view
Loading...