0000000000000000000000000000000000000000 473c583ca61b2191c1529ea731a71af5eff23329 Eduardo Lima (Etrunko) <etrunko@etrunko-desktop.(none)> 1241047998 -0300	clone: from git@code.openbossa.org:canola/mainline.git
473c583ca61b2191c1529ea731a71af5eff23329 8e3f4cd803f1501b619f7606ddfc2787906848d6 Eduardo Lima (Etrunko) <etrunko@etrunko-desktop.(none)> 1242238868 -0300	rebase finished: refs/heads/master onto 8e3f4cd803f1501b619f7606ddfc2787906848d6
8e3f4cd803f1501b619f7606ddfc2787906848d6 b8b38833c460630232e1f823ea32761ce7728ab8 Eduardo Lima (Etrunko) <etrunko@etrunko-desktop.(none)> 1242243411 -0300	rebase -i (finish): refs/heads/master onto 473c583)
b8b38833c460630232e1f823ea32761ce7728ab8 9eb1f9342705115c4c6c6d58d9425728044286d9 Eduardo Lima (Etrunko) <etrunko@etrunko-desktop.(none)> 1242245176 -0300	HEAD^: updating HEAD
9eb1f9342705115c4c6c6d58d9425728044286d9 b8b38833c460630232e1f823ea32761ce7728ab8 Eduardo Lima (Etrunko) <etrunko@etrunko-desktop.(none)> 1242248273 -0300	origin/master: updating HEAD
b8b38833c460630232e1f823ea32761ce7728ab8 07f49ca45afbc43d0275dff41b164522cc353f7a Eduardo Lima (Etrunko) <etrunko@etrunko-desktop.(none)> 1242249940 -0300	commit: Images: Catch exception when trying to convert encoding
07f49ca45afbc43d0275dff41b164522cc353f7a 4a904380cda186149fbd3dfd7ec6aab399a5c68a Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1242250097 -0300	commit (amend): Images: Catch exception when trying to convert encoding
4a904380cda186149fbd3dfd7ec6aab399a5c68a 835aa3f573e643d68502068c80c243b05de6a5be Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1242250122 -0300	commit (amend): Images: Catch exception when trying to convert encoding
835aa3f573e643d68502068c80c243b05de6a5be e0b27d655c94de44920b1f02d121c312d0b52f58 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1242250201 -0300	commit (amend): Images: Catch exception when trying to convert encoding
e0b27d655c94de44920b1f02d121c312d0b52f58 b8b38833c460630232e1f823ea32761ce7728ab8 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1242250249 -0300	HEAD^: updating HEAD
b8b38833c460630232e1f823ea32761ce7728ab8 7c3df88780369daade8ecd922709e78d6a0bfb15 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1242250253 -0300	commit: Images: Catch exception when trying to convert encoding
7c3df88780369daade8ecd922709e78d6a0bfb15 25a7f99e04dd756bf1279535467871149d333941 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1242327827 -0300	commit: Use proper terra function to handle encoding
25a7f99e04dd756bf1279535467871149d333941 eb622e32e9775d2c8210a6521c7740e16e4dd238 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1242332395 -0300	commit: Images: Hide/Show back and options buttons in/out slideshow mode
eb622e32e9775d2c8210a6521c7740e16e4dd238 f3c4e5c78dae825e86a4a89b514b19995f41141d Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1243759608 +0200	commit: Added additional permission to the license under GPLv3 section 7
f3c4e5c78dae825e86a4a89b514b19995f41141d 8b1b6ccf19b19c3ab93a9ee209f68b820142b90e Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1243761493 +0200	commit (amend): Added additional permission to the license under GPLv3 section 7
8b1b6ccf19b19c3ab93a9ee209f68b820142b90e 42017b079f10c0634a6a4774bd61821fcb69609b Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1243769645 +0200	commit: Photocast: Added missing method to SettingsPhotocastModelFolder
42017b079f10c0634a6a4774bd61821fcb69609b 9930c78d207d8bcf83ff50c4aba227475c40d673 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1243783622 +0200	commit: Multitask: Reset model state_reason befor unrefing the controller
9930c78d207d8bcf83ff50c4aba227475c40d673 9f63091ce0dffee842dce649dfc4c423b3a85834 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1248121978 -0300	merge andrei/master: Merge made by recursive.
9f63091ce0dffee842dce649dfc4c423b3a85834 2b57647876ac693d881caf94797a49f6608ec0af Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1250980605 -0300	commit: Themes: Imported "official" themes
2b57647876ac693d881caf94797a49f6608ec0af 24e2ba3f1532dc83d8dab962d24b4a7ea17848b9 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1250981224 -0300	rebase finished: refs/heads/master onto 626781f0b29f0fb0a1a278e0220237e8a68338d8
24e2ba3f1532dc83d8dab962d24b4a7ea17848b9 d5de9f8a311dbfa084e9b4f99cbe82b046b24f9c Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1254172289 -0300	commit: IRadio: Added new mime type to list of known types
d5de9f8a311dbfa084e9b4f99cbe82b046b24f9c e3f9fbdd4b66a22c1b7f00e9324f52eb074eea19 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1254430319 -0300	commit: Added function to return the default evas engine
e3f9fbdd4b66a22c1b7f00e9324f52eb074eea19 7f85058982b8bb8b5a2be6901a78348cb616950b Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1254496710 -0300	commit: Settings: Refactoring General Settings Model
7f85058982b8bb8b5a2be6901a78348cb616950b 481b919d8e9053b0ebedeae94f6c0b8541b2eb07 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1254496879 -0300	commit (amend): Settings: Refactoring General Settings Model
481b919d8e9053b0ebedeae94f6c0b8541b2eb07 6115029229d3b653088182771c54d45cc959aae0 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1254497396 -0300	commit (amend): Settings: Refactoring General Settings Model
6115029229d3b653088182771c54d45cc959aae0 ab2be50db496068ad6deb6781fa32fd0444d2292 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1254499517 -0300	commit (amend): Settings: Refactoring General Settings Model
ab2be50db496068ad6deb6781fa32fd0444d2292 a81920d19c62f01e4e5592347d050155f0d949b1 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1254499634 -0300	commit (amend): Settings: Refactoring General Settings Model
a81920d19c62f01e4e5592347d050155f0d949b1 028a584175b138c2288d0f348dc41e9078679655 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1254499818 -0300	commit: Turn MainMenuModelFolder into a Singleton
028a584175b138c2288d0f348dc41e9078679655 547a51a57cfcd36ed7aeae2079fb78408d19612d Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1254499981 -0300	rebase -i (finish): refs/heads/master onto d5de9f8
547a51a57cfcd36ed7aeae2079fb78408d19612d d379ee7eba6b939ce546ea2f961c1bc060238599 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1254501543 -0300	commit: TEMP COMMIT
d379ee7eba6b939ce546ea2f961c1bc060238599 1ab7396af2500f91565fd507a391108f5ccf07a6 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1254501628 -0300	rebase -i (finish): refs/heads/master onto e3f9fbd
1ab7396af2500f91565fd507a391108f5ccf07a6 f6201138045f68a02fc90b7c0fbff5d520db6e1c Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1254505108 -0300	commit (amend): TEMP COMMIT
f6201138045f68a02fc90b7c0fbff5d520db6e1c 4fa24a91e34d4b7f6b4d8c22339724bec39f0d2b Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1254507245 -0300	commit (amend): New Main Menu Settings plugin
4fa24a91e34d4b7f6b4d8c22339724bec39f0d2b 9ee395c51a33f705b716feb44a6994e2c9afac88 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1254509063 -0300	commit: Fixing encoding bugs
9ee395c51a33f705b716feb44a6994e2c9afac88 5e986c3fa00495d65393d6ce3f0a3d2d61be75fd Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1254512627 -0300	commit: Settings: Fixed call to GeneralSettingsActionModel
5e986c3fa00495d65393d6ce3f0a3d2d61be75fd 55de4660df97a7f2b140933d961c5de08ecc6aab Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1254858216 -0300	commit: Settings: Theme selection code cleanup
55de4660df97a7f2b140933d961c5de08ecc6aab fd4f6f5057618050a7604c075aec76a5ba902a21 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1254859987 -0300	commit: Ondemand: Fixed typo in key for update-name query
fd4f6f5057618050a7604c075aec76a5ba902a21 55de4660df97a7f2b140933d961c5de08ecc6aab Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1254860172 -0300	HEAD^: updating HEAD
55de4660df97a7f2b140933d961c5de08ecc6aab 16ee8ab5d376ad70a37069c20ec7f09e71460bf4 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1254860175 -0300	commit: Ondemand: Fixed typo in key for update-title query
16ee8ab5d376ad70a37069c20ec7f09e71460bf4 87b4fffaa62e0682f8c9cb8caf3e518a23e49420 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1255077219 -0300	commit: Audio: Catch exception in string to int conversion
87b4fffaa62e0682f8c9cb8caf3e518a23e49420 2f282b39067667c05af3fa77a2bcc572fa270eee Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1255983788 -0300	commit: Media Base: Set player state to paused before seek
2f282b39067667c05af3fa77a2bcc572fa270eee 4d9bf3a86ead9f5d8822622ff805389136396436 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1255984089 -0300	commit: Audio: Fixed typo
4d9bf3a86ead9f5d8822622ff805389136396436 64bb0f5502a4caa15b3c057af7dbbe61f604939a Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1255984167 -0300	commit: Audio: Fixed play count update
64bb0f5502a4caa15b3c057af7dbbe61f604939a dd09154d10197381178462d875c8f0be49b89c42 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1256070417 -0300	commit: Main: Removed unecessary references to self._mger
dd09154d10197381178462d875c8f0be49b89c42 8ef498da34f14082c682875ad713ec9c169b70e8 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1256076047 -0300	rebase finished: refs/heads/master onto 8ef498da34f14082c682875ad713ec9c169b70e8
8ef498da34f14082c682875ad713ec9c169b70e8 dd09154d10197381178462d875c8f0be49b89c42 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1256135697 -0300	origin/master: updating HEAD
dd09154d10197381178462d875c8f0be49b89c42 8ef498da34f14082c682875ad713ec9c169b70e8 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1256135802 -0300	rebase finished: refs/heads/master onto 8ef498da34f14082c682875ad713ec9c169b70e8
8ef498da34f14082c682875ad713ec9c169b70e8 dd09154d10197381178462d875c8f0be49b89c42 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1256135831 -0300	origin/master: updating HEAD
dd09154d10197381178462d875c8f0be49b89c42 8ef498da34f14082c682875ad713ec9c169b70e8 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1256135943 -0300	rebase finished: refs/heads/master onto 8ef498da34f14082c682875ad713ec9c169b70e8
8ef498da34f14082c682875ad713ec9c169b70e8 65e70c7b5991fda06c21d8624ed4fc34ce037782 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1256153592 -0300	commit: Makes slideshow Loop and Random options persistent
65e70c7b5991fda06c21d8624ed4fc34ce037782 1d3e9645c590527be12d93d508e0551b7fa2781c Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1256158869 -0300	commit: Randomize image list if the option is set
1d3e9645c590527be12d93d508e0551b7fa2781c cefb371651f8f19ad24f4a4bd53fb5b9a67f4b67 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1256330703 -0300	commit: Revert "Media Base: Set player state to paused before seek"
