lp:~mutse-young/chinese-calendar/trunk

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:chinese-calendar/1.0

Ubuntu Kylin Members: Pending requested 2013-05-06

Diff: 5026 lines (+4847/-0) (has conflicts)

27 files modified

calendar.ui (+1359/-0)
ccbo.cpp (+490/-0)
ccbo.h (+108/-0)
chinese-calendar.desktop (+10/-0)
chinese-calendar.pro (+65/-0)
chinese-calendar.qrc (+10/-0)
chinesecalendar.cpp (+1265/-0)
chinesecalendar.h (+111/-0)
cnote.cpp (+89/-0)
cnote.h (+39/-0)
dateitem.cpp (+195/-0)
dateitem.h (+76/-0)
dateitem.ui (+71/-0)
datemaskwidget.cpp (+41/-0)
datemaskwidget.h (+48/-0)
debian/changelog (+57/-0)
debian/compat (+1/-0)
debian/control (+17/-0)
debian/copyright (+19/-0)
debian/rules (+5/-0)
debian/source/format (+1/-0)
img/chinesecalendar.svg (+214/-0)
main.cpp (+61/-0)
skin/README.md (+27/-0)
skin/black-skin.qss (+189/-0)
skin/default-skin.qss (+138/-0)
translate/i18_zh_CN.ts (+141/-0)

api

Related source package recipes

1 recipe using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

33. By mutse on 2013-05-06

delete ok.png note.png no.png chinesecalendarBGyellow.png of img

32. By mutse on 2013-05-01

delete .tmp

31. By mutse on 2013-05-01

add skin change function

30. By mutse on 2013-05-01

add skin files

29. By mutse on 2013-04-29

add chinese calendar source code

28. By Abel Liu on 2013-04-17

update changelog

27. By Abel Liu on 2013-04-17

update changelog

26. By Abel Liu on 2013-04-07

fix bug #1161756

25. By Abel Liu on 2013-04-01

fix bug #1161425

24. By Abel Liu on 2013-04-01

fix bug #1161425