Viewing all changes in revision 200.1.2.
- Committer: Victor Thompson
- Date: 2014-04-29 23:44:39 UTC
- mfrom: (244 trunk)
- mto: This revision was merged to the branch mainline in revision 245.
- Revision ID: victor.thompson@gmail.com-20140429234439-ug4ugmw8wfq21n29
Merge of trunk and regenerate .pot file
- files added:
- CMakeLists.txt
- click
- files removed:
- calculator64.png
- files renamed:
- images/trash.png => Simple/images/trash.png
- apparmor/calculator.json => click/apparmor.json
- manifest.json => click/manifest.json.in
- ubuntu-calculator-app.desktop => com.ubuntu.calculator_calculator.desktop.in
- ubuntu-calculator-app => ubuntu-calculator-app.in *
- files modified:
- Simple/CalcKeyboard.qml
expand all
collapse all
added
removed
calculator-app@30.png
calculator64.png
