Solve conflict
[framework/uifw/evas.git] / src /
2012-07-04 devilhornsEvas: Remove unused variables.
2012-07-04 cedricevas: move evas_common_pipe_init out of the #if.
2012-07-04 cedricevas: remove duplication.
2012-07-04 cedricevas: fix back line and polygon draw with pipe rendering.
2012-07-04 cedricevas: make the code do what we expect by destroying...
2012-07-04 cedricevas: add more infrastructure to the prepare stage...
2012-07-04 devilhornsEvas (wayland_shm): Fix regression where resizing windo...
2012-07-03 devilhornsEvas (gif loader): Merge Tizen changes to upstream...
2012-07-03 devilhornsEvas (gl_common): Merge Tizen changes to upstream EFL.
2012-07-03 devilhornsEvas (wayland_shm): Support evas cserve2.
2012-07-03 devilhornsEvas (gl_x11): Merge changes from Tizen to upstream...
2012-07-03 devilhornsEvas: Merge evas_object_image changes from Tizen to...
2012-07-03 tasnEvas: Revert "Evas: Support harfbuzz version checking...
2012-07-03 devilhornsEvas: Support harfbuzz version checking.
2012-07-02 rastertextgrid - use evas coords for cell size. more correct...
2012-06-29 sachielRemove the right element from the list
2012-06-29 sachielLet's not fall into an infinite loop with blocked
2012-06-29 sachielTHE MOST IMPORTANT COMMIT IN THE HISTORY OF HUMANITY
2012-06-29 sachielDon't block waiting for response to font_load before
2012-06-29 sachielAdd support for a request to depend on another
2012-06-29 devilhornsEvas: Support cserve2 for xcb engine.
2012-06-29 Jiyoun Parkupstream merge
2012-06-28 rasterfix refcounting issue with font instances.
2012-06-28 Park, Sung WooEvasGL: Adding MSAA for depth_24_stencil_8 format that...
2012-06-28 sungEvasGL: Adding MSAA for depth_24_stencil_8 format that...
2012-06-27 sachielMark the slave as not done when it starts a job
2012-06-27 sachielPrevent using freed data in epoll events
2012-06-27 Park, Sung WooEvasGL: Fixed a few minor bugs.
2012-06-27 sungEvasGL: Fixed a few minor bugs.
2012-06-26 stefanevas/cserve2: Don't use var names that are used as...
2012-06-26 devilhornsEvas (wayland_egl): Patch from Alex Wu to fix NULL...
2012-06-26 discomfitorcasting for windows
2012-06-26 discomfitorcast warnings--
2012-06-26 discomfitoruse correct format string
2012-06-26 discomfitorunused--
2012-06-26 rasterquick initial flag fdor double width char cells in...
2012-06-25 antognollievas/cserve2: Don't take "used glyphs" messages into
2012-06-25 antognollievas/cserve2: Calculate average time saved on glyph
2012-06-25 antognollievas/cserve2: Add entries loading saved time.
2012-06-25 sachielDon't free file entries while there are still images...
2012-06-25 sachielRe-enable the used glyphs message now that it doesn...
2012-06-25 antognollievas/cserve2: Add image size and loading time stats.
2012-06-25 rasterminor improvbement to evas gl engine -> blacklist softw...
2012-06-25 discomfitorint -> ptr more correctly
2012-06-23 rasterclean up terminal char line drawing fallback to be...
2012-06-22 sachielAdd simple debug client for cserve2
2012-06-22 sachielFix generation of FONT_DEBUG response
2012-06-22 antognollievas/cserve2: Silent some warnings (and also fix wrong
2012-06-22 antognollievas/cserve2: Rename some stats and add some more for...
2012-06-22 antognollievas/cserve2: Only declare timeval function if debug is
2012-06-22 antognollievas/fonts: Remove warning.
2012-06-22 antognollievas/cserve2: Change our fash implemenation name.
2012-06-22 antognollievas/cserve2: CServe2 client side lib modifications.
2012-06-22 antognollievas/cserve2: Add font and glyphs loading implementation
2012-06-22 antognollievas/cserve2: Add common fash for glyphs.
2012-06-21 rastertenative font glyph workaround for fonts not containing...
2012-06-21 Park, Sung WooEvas GL Bug Fix: Fixed int variables that were assumed...
2012-06-20 Jiyoun ParkUpstream merge
2012-06-20 stefanevas/cserve2: Enums can hold negative values fine....
2012-06-20 stefanevas/cserve2: Unused parameter warnings--
2012-06-20 cedricevas: don't forget to destroy all the cached Evas_Text_...
2012-06-20 cedricevas: fix working with utf8.
2012-06-20 rasterprintf-- and keep inset line in case for later
2012-06-20 rasterwoooow line advance broken for bitmap fonts!
2012-06-20 rasterfix grid sizing for textgrid with some mono ttf fonts!
2012-06-20 cedricevas: small 25% speed up of textgrid (we are still...
2012-06-19 caroEvas: remove software DirectDraw 16 bits engine
2012-06-18 tasnEvas textblock: Fixed rendering issues with small fonts.
2012-06-18 rasterfix underline and strikethrough drawing in textgrid.
2012-06-18 tasnEvas textblock: Fixed issue with _textblock_clear and...
2012-06-18 rasterdotn segv if color vals beyond palette size in tg.
2012-06-18 tasnEvas textblock: Fixed issues with deleting paragraphs...
2012-06-18 tasnEvas font: Revert "This makes build break when harfbuz...
2012-06-18 rasterfix off-by-1 in textgrid!
2012-06-18 jyparkThis makes build break when harfbuz already installed .
2012-06-18 cedricevas: destroy the mutex after we use it for the last...
2012-06-17 rasterremove workaround thanks to tasn font fix.
2012-06-17 tasnEvas font: Fix the font engine to work with Bitmap...
2012-06-17 cedricevas: let's have an O(1) check instead of O(N).
2012-06-17 rasteradd ()'s
2012-06-17 rasterfix gl engine bitmap fonts :)
2012-06-17 rasterwanrn--
2012-06-17 rasteradjust default memprool alloc sizes. too big imho.
2012-06-16 rasterprintf--
2012-06-16 rasterfont changes update correctly now in tg.
2012-06-16 rasterwrong logic check. fix!
2012-06-16 rastercompleting more work on textgrid. well optimized now...
2012-06-15 rasterworkaround text issue not getting widht of stirng right...
2012-06-15 rasterfix new textgrid to actually handle updates right....
2012-06-15 hermetevas/render - clean up when map is enabled. In this...
2012-06-15 hermetevas/render - no. my fault.
2012-06-15 hermetevas/render - removed useless param
2012-06-15 hermetevas/render - fix indent.
2012-06-15 hermetevas/event - simpler route
2012-06-15 discomfitorchangelog + documentation for evas_object_smart_members...
2012-06-15 discomfitormake evas_object_smart_members*get return NULL for...
2012-06-15 caroEvas: add textgrid object (not finished, nor optimized...
2012-06-15 discomfitorhey how about we stop breaking evas and edje with EVERY...
2012-06-14 cedricevas: cache conversion from Evas_Map to RGBA_Map.
2012-06-14 jyparkmax_samples makes redeclaration
next