Merge branch 'maint-1.0' into maint-1.1
- maint-1.0: installation: fix autotools rsync instructions git: new entry in gitignore
Conflicts:
.gitignore
Signed-off-by: Tibor Simko <tibor.simko@cern.ch>
Tibor Simko <tibor.simko@cern.ch> | Aug 21 2013, 16:53 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
41ee2e22bb3c | Tibor Simko | installation: fix autotools rsync instructions | Aug 21 2013 | |||
051ce3dfde86 | Tibor Simko | git: new entry in gitignore | Aug 20 2013 |