Viewing all changes in revision 317.
- Committer: Adnane Belmadiaf
- Date: 2013-09-23 14:48:21 UTC
- mfrom: (310.1.17 trunk)
- Revision ID: daker@ubuntu.com-20130923144821-bwtp8lk27402mvio
Merged trunk
Fixed merge conflicts
Fixed merge conflicts
- files added:
- po/id.po
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
