Context Navigation

← Previous Changeset
Next Changeset →

Changeset 8352

Timestamp:

Apr 28, 2011, 7:20:43 AM (14 years ago)

Author:

rgrieder

Message:

Added merge info for the kicklib2 merging. There seems to be a bug with TortoiseSVN where it cannot (I tried for two hours now) commit a directory deletion when there is merge info present.

File:

: 1 edited

code/trunk (modified) (1 prop)

code/trunk

Property svn:mergeinfo changed

/code/branches/kicklib	merged: 7940-7948,7950-7951,7953,7956-7957,7959-7961,7964-7965,7967-7969,7971,7973-7974,7979-7984,8057-8058,8061-8064,8066-8068,8071,8073-8074,8080-8082,8089,8094-8096,8098,8103,8111-8113,8118-8124,8126,8129-8132,8134,8176,8216-8218,8221-8222,8224-8225,8230-8231,8233,8268-8274,8277
/code/branches/kicklib2 (added)	merged: 8282-8288,8291-8296,8298-8299,8304,8307-8308,8311-8313,8317-8326,8328,8331-8345,8347-8350
/code/branches/mac_osx (added)	merged: 7789,7933-7934,8042-8049,8054-8056,8059-8060,8065,8069-8070,8072,8083-8084,8090-8092,8114,8116,8125,8127-8128,8135
/code/branches/ois_update (added)	merged: 7506-7528,7530,7532,7553,7557-7560,7562-7564,7567,7570-7572,7575-7578,7582,7591-7592,7615,7618-7624,7660,7664,7669,7681-7683,7691,7701,7719,7767,7771,7782

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 8352

code/trunk

Download in other formats: