重新把1月16号之后dev的所有commit再pull一遍

kernelhcy / gtkqq

a qq client based on gtk+ uses webqq protocol

http://code.google.com/p/gtk-qq/

GNU General Public License v3.0

181 stars 42 forks source link

Closed billzt closed 12 years ago

billzt commented 12 years ago

不明白为什么 kernelhcy/gtkqq 恢复到 16 号之前了？我重新 pull request 一遍？不是很懂，各位大大请见谅

shwangdev commented 12 years ago

merge不了

billzt commented 12 years ago

@wxjeacen 那现在还有什么补救措施？

shwangdev commented 12 years ago

手动change code and merge

2012/2/3 billzt reply@reply.github.com:

@wxjeacen 那现在还有什么补救措施？

Reply to this email directly or view it on GitHub: https://github.com/kernelhcy/gtkqq/pull/70#issuecomment-3791648

Best Regards,

Devil Wang| Engineer of Linux

Gtalk: wxjeacen AT gmail DOT com