Do a merge -s ours of 1.3 plugin version change.
The plugin version was already changed (differently) in master,
but we need to let git think the 1.3 commit was merged
to avoid conflicts later.
Description
Description
Details
Details
- Committed
nalvarez Jan 4 2012, 9:24 PM - Parents
- R32:28bac3de1de8: set plugin version to 13 in preparation of 4.3 release
R32:085f2ed42bea: Merge changes from 1.3. - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 28bac3de1de8 | mwolff | set plugin version to 13 in preparation of 4.3 release | Jan 4 2012 |