diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-31 20:01:40 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-31 20:01:40 +0000 |
| commit | 5299c1f6fb7cc9fa5e6dad9107ccab1417179731 (patch) | |
| tree | 52d7d482e7310407aa3f48dfd757ec13a6ce413d /pkgs/tools/text | |
| parent | 3f44fb8f2f1ab6bb0571eef0fe16748d951b91f1 (diff) | |
| parent | d789eb6a05b5eb2bd3c46798a1e7babfcffe1413 (diff) | |
svn merge ^/nixpkgs/trunk backups/glib-2.30-take2@33502
- 1 conflict (gnome-doc-utils) - final merge before --reintegrate svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500
Diffstat (limited to 'pkgs/tools/text')
0 files changed, 0 insertions, 0 deletions