SuccessChanges

Summary

  1. Merged in edmac (pull request #718) Edmac info fixes
  2. Close branch edmac
  3. Merged in powersave-focusring (pull request #715) Attempt to fix issue #2431 (turning the focus ring doesn't reset Canon's powersave timer)
  4. Close branch powersave-focusring
  5. Merged in tecgen/50D_FUNC_instead_of_Q_icon (pull request #706) (also for 5D2 and 100D)
  6. Fine-tuned submenu icons
  7. trying to revert any changes to whitspaces; there shouldn't be any differences at all between this file and the one of hudson/magic-lantern
  8. added a1ex implementation to merge many classes into one
  9. new: Av-icons made my nikfreak; renamed variable camera_model to labels
  10. edit of the legs of A
  11. Av-icons are generated and used instead of Q-icons for 100D and are merged together with 50D, 52D and low resolutions version into one ico.c class
  12. added Av-icons as replacement for the Q-button icon on the 100D
  13. Merged unified into 50D_FUNC_instead_of_Q_icon
  14. added camera model to generated code comment in order to help the diff command to recognise the differences between multiple files better
  15. reverted last commit
  16. bugfix: now the focus icon is visible again
  17. clean code: exchanged -D with the --ifdef option
  18. enabled the new icon only for 50D after testing it on the real camera
  19. corrected pixel in FUNC png's and generated ico.c again
  20. generating model specific icons to exchange the Q icon (only 50D and 5D2)
  21. aligned the content within the icons to look nice after converting them with make-icons.py (see generated ico.c)
  22. added the new FUNC and picture style icons within the list of icons in the python make script
  23. draft for the picture style icons
  24. initial draft
  25. Created new branch 50D_FUNC_instead_of_Q_icon
  26. Merged hudson/magic-lantern into unified
  27. reverted: remember user selected samplerate after reboot
  28. remember user selected samplerate after reboot
  29. EDMAC info: misc tweaks/fixes
  30. edmac.c: fix edmac_chanlist
  31. edmac.c, edmac_get_connection: fix for write connections
  32. Attempt to fix issue #2431 (turning the focus ring doesn't reset powersave timer; Canon bug?)
Changeset 12015:8028ea4b9660 by a1ex <broscutamaker@gmail.com>:
Merged in edmac (pull request #718)<br><br>Edmac info fixes
Changeset 12014:3c2a5cdb328b by a1ex <broscutamaker@gmail.com>:
Close branch edmac
Changeset 12013:95e5ca3c6784 by a1ex <broscutamaker@gmail.com>:
Merged in powersave-focusring (pull request #715)<br><br>Attempt to fix issue #2431 (turning the focus ring doesn&#039;t reset Canon&#039;s powersave timer)
Changeset 12012:5ea186abdfb7 by a1ex <broscutamaker@gmail.com>:
Close branch powersave-focusring
Changeset 12011:cf00339eb9cd by alex@thinkpad:
Merged in tecgen/50D_FUNC_instead_of_Q_icon (pull request #706) (also for 5D2 and 100D)
Changeset 12010:e8fc0a3bf533 by alex@thinkpad:
Fine-tuned submenu icons
The file was modifiedicons/Av-back.png (diff)
The file was modifiedicons/Av-forward.png (diff)
The file was modifiedicons/FUNC-back.png (diff)
The file was modifiedicons/FUNC-forward.png (diff)
The file was modifiedicons/picstyle-back.png (diff)
The file was modifiedicons/picstyle-forward.png (diff)
The file was modifiedsrc/ico.c (diff)
Changeset 12009:6166ff7bec8b by tecgen < >:
trying to revert any changes to whitspaces; there shouldn&#039;t be any differences at all between this file and the one of hudson/magic-lantern
The file was modifiedmodules/mlv_snd/mlv_snd.c (diff)
Changeset 12008:6d2b8b93c628 by tecgen < >:
added a1ex implementation to merge many classes into one
The file was modifiedicons/make-icons.py (diff)
The file was modifiedicons/mkfont-canon (diff)
The file was modifiedsrc/ico.c (diff)
Changeset 12007:390eaba67e7f by tecgen < >:
new: Av-icons made my nikfreak; renamed variable camera_model to labels
The file was modifiedicons/Av-back.png (diff)
The file was modifiedicons/Av-forward.png (diff)
The file was modifiedicons/make-icons.py (diff)
The file was modifiedicons/mkfont-canon (diff)
The file was modifiedsrc/ico.c (diff)
Changeset 12006:804f4b6b5347 by tecgen < >:
edit of the legs of A
The file was modifiedicons/Av-back.png (diff)
The file was modifiedicons/Av-forward.png (diff)
The file was modifiedsrc/ico.c (diff)
Changeset 12005:e75ccf63e8e1 by tecgen < >:
Av-icons are generated and used instead of Q-icons for 100D and are merged together with 50D, 52D and low resolutions version into one ico.c class
The file was modifiedicons/make-icons.py (diff)
The file was modifiedsrc/ico.c (diff)
Changeset 12004:391645999463 by tecgen < >:
added Av-icons as replacement for the Q-button icon on the 100D
The file was addedicons/Av-back.png
The file was addedicons/Av-forward.png
Changeset 12003:55b1830ccfa8 by tecgen <dj_tecgen@yahoo.de>:
Merged unified into 50D_FUNC_instead_of_Q_icon
Changeset 12002:32b242421fcd by tecgen:
added camera model to generated code comment in order to help the diff command to recognise the differences between multiple files better
The file was modifiedicons/make-icons.py (diff)
The file was modifiedicons/mkfont-canon (diff)
The file was modifiedsrc/ico.c (diff)
Changeset 12001:764ecd340e1e by tecgen < >:
reverted last commit
The file was modifiedicons/make-icons.py (diff)
The file was modifiedsrc/ico.c (diff)
Changeset 12000:b94a4371f968 by tecgen < >:
bugfix: now the focus icon is visible again
The file was modifiedicons/make-icons.py (diff)
The file was modifiedsrc/ico.c (diff)
Changeset 11999:bb6e0426c00d by tecgen < >:
clean code: exchanged -D with the --ifdef option
The file was modifiedicons/make-icons.py (diff)
Changeset 11998:c86f204cd5fa by tecgen < >:
enabled the new icon only for 50D after testing it on the real camera
The file was modifiedicons/make-icons.py (diff)
The file was modifiedsrc/ico.c (diff)
Changeset 11997:a39ce78af950 by tecgen < >:
corrected pixel in FUNC png&#039;s and generated ico.c again
The file was modifiedicons/FUNC-back.png (diff)
The file was modifiedicons/FUNC-forward.png (diff)
The file was modifiedsrc/ico.c (diff)
Changeset 11996:261200f3d4b6 by tecgen < >:
generating model specific icons to exchange the Q icon (only 50D and 5D2)
The file was modifiedicons/make-icons.py (diff)
The file was modifiedsrc/ico.c (diff)
Changeset 11995:f146050ba9ba by tecgen < >:
aligned the content within the icons to look nice after converting them with make-icons.py (see generated ico.c)
The file was modifiedicons/FUNC-back.png (diff)
The file was modifiedicons/FUNC-forward.png (diff)
The file was modifiedicons/picstyle-back.png (diff)
The file was modifiedicons/picstyle-forward.png (diff)
The file was modifiedsrc/ico.c (diff)
Changeset 11994:12dd4d0b4e18 by tecgen < >:
added the new FUNC and picture style icons within the list of icons in the python make script
The file was modifiedicons/make-icons.py (diff)
Changeset 11993:0ad6ea3b0274 by tecgen < >:
draft for the picture style icons
The file was addedicons/picstyle-back.png
The file was addedicons/picstyle-forward.png
Changeset 11992:fa988e042800 by tecgen < >:
initial draft
The file was addedicons/FUNC-back.png
The file was addedicons/FUNC-forward.png
Changeset 11991:177730c4d437 by tecgen <dj_tecgen@yahoo.de>:
Created new branch 50D_FUNC_instead_of_Q_icon
Changeset 11990:4135f9020d1f by tecgen <dj_tecgen@yahoo.de>:
Merged hudson/magic-lantern into unified
Changeset 11989:3a423dd357a2 by tecgen:
reverted: remember user selected samplerate after reboot
The file was modifiedmodules/mlv_snd/mlv_snd.c (diff)
Changeset 11988:9c1e0ceca80b by tecgen < >:
remember user selected samplerate after reboot
The file was modifiedmodules/mlv_snd/mlv_snd.c (diff)
Changeset 11987:afa7e6f9e474 by alex@thinkpad:
EDMAC info: misc tweaks/fixes
The file was modifiedsrc/debug.c (diff)
Changeset 11986:1ad33601bb6f by alex@thinkpad:
edmac.c: fix edmac_chanlist
The file was modifiedsrc/edmac.c (diff)
Changeset 11985:35cb8e7ecdcc by alex@thinkpad:
edmac.c, edmac_get_connection: fix for write connections
The file was modifiedsrc/edmac.c (diff)
Changeset 11984:7cdff8dcacd0 by alex@thinkpad:
Attempt to fix issue #2431 (turning the focus ring doesn&#039;t reset powersave timer; Canon bug?)
The file was modifiedsrc/lens.c (diff)