did I mention I don't like git?

merge-requests/1/head
m. allan noah 2011-11-01 16:14:27 -04:00
rodzic 938469218b
commit bbecafdfba
1 zmienionych plików z 0 dodań i 1 usunięć

Wyświetl plik

@ -18,7 +18,6 @@
backend/rts88xx_lib.c, backend/xerox_mfp.c, sanei/sanei_pio.c:
Include <sys/types.h> for definition of u_long on MacOS X
* po/sv.po: Update Swedish translation
>>>>>>> f0e42223a7ef1c4c10aa256b3f42f65bdebf4998
2011-10-21 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys.h backend/genesys_devices.c