Show
Ignore:
Timestamp:
12/19/09 08:12:53 (11 years ago)
Author:
ppalmers
Message:

Merged revisions 1536,1541,1544-1546,1549,1554-1562,1571,1579-1581,1618,1632,1634-1635,1661,1677-1679,1703-1704,1715,1720-1723,1743-1745,1755 via svnmerge from
svn+ssh://ffadosvn@ffado.org/ffado/branches/libffado-2.0

Also fix remaining format string warnings.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado

    • Property svnmerge-blocked changed from
      /branches/libffado-2.0:1563,1565,1750

      to /branches/libffado-2.0:1563,1565,1750
    • Property svnmerge-integrated changed from
      /branches/libffado-2.0:1-1532,1566-1570,1572-1578,1582-1617,1619-1631,1633,1636-1660,1662-1676,1680-1686

      to /branches/libffado-2.0:1-1562,1564,1566-1749,1751-1762
  • trunk/libffado/support/firmware/fireworks-downloader.cpp

    r1498 r1763  
    2323 */ 
    2424 
     25#include "fbtypes.h" 
    2526#include "downloader.h" 
    2627 
     
    214215 
    215216    if (node_id < 0) { 
    216         printMessage("Could not find device with GUID 0x%016llX\n", guid); 
     217        printMessage("Could not find device with GUID 0x%016"PRIX64"\n", guid); 
    217218        return -1; 
    218219    }