diff options
| author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-08-01 19:23:51 (GMT) |
|---|---|---|
| committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-08-01 19:23:51 (GMT) |
| commit | e7a33e537d1ea5432cdc17aadfb07f33efd7037f (patch) | |
| tree | f90efce7d16caec13ce04ee31e6c6909f5b26df6 /scripts/xinitrc | |
| parent | be45a2fa5e14e625b365db1713c0bb367e220bd4 (diff) | |
| parent | 6815fd828caa76935bd02eafa719a34f983b671b (diff) | |
Merge branch 'master' of git.sugarlabs.org:sugar-build/sugar-build
Conflicts:
Makefile
scripts/system.modules
Diffstat (limited to 'scripts/xinitrc')
0 files changed, 0 insertions, 0 deletions