Show
Ignore:
Timestamp:
03/05/09 10:28:20 (4 years ago)
Author:
gpolo
Message:

Merged revisions 4269-4277 via svnmerge from
http://svn.umitproject.org/svnroot/umit/trunk

................

r4269 | luis | 2009-03-04 14:41:02 -0300 (Wed, 04 Mar 2009) | 17 lines


Merged revisions 4093,4267-4268 via svnmerge from
http://svn.umitproject.org/svnroot/umit/branch/InterfaceEditor


........

r4093 | luis | 2009-02-17 19:30:33 +0000 (Tue, 17 Feb 2009) | 1 line


Added tests to InterfaceEditor?

........

r4267 | luis | 2009-03-04 17:35:48 +0000 (Wed, 04 Mar 2009) | 1 line


Keep update bin - fixing what happens during merge

........

r4268 | luis | 2009-03-04 17:36:33 +0000 (Wed, 04 Mar 2009) | 1 line


Rename a class name and change title of InterfaceEditor?

........

................

r4270 | gpolo | 2009-03-04 19:12:47 -0300 (Wed, 04 Mar 2009) | 1 line


Fixed ticket #125: Update the recent scans listing without needing to restart Umit.

................

r4271 | gpolo | 2009-03-04 20:01:40 -0300 (Wed, 04 Mar 2009) | 1 line


Cleaning up the installers, fixing most of ticket #235.

................

r4272 | gpolo | 2009-03-04 20:20:04 -0300 (Wed, 04 Mar 2009) | 1 line


Moved common paths between the installers to install_scripts/common.py

................

r4273 | gpolo | 2009-03-04 20:29:20 -0300 (Wed, 04 Mar 2009) | 1 line


typo fix

................

r4274 | gpolo | 2009-03-04 20:38:11 -0300 (Wed, 04 Mar 2009) | 1 line


Added missing import and fixed path to umit's root.

................

r4275 | gpolo | 2009-03-04 22:22:36 -0300 (Wed, 04 Mar 2009) | 1 line


Some tweaks.

................

r4276 | gpolo | 2009-03-04 22:37:45 -0300 (Wed, 04 Mar 2009) | 1 line


Removed trailing whitespaces, reformated to < 80 columns.

................

r4277 | gpolo | 2009-03-04 22:40:36 -0300 (Wed, 04 Mar 2009) | 2 lines


Ran reindent.py on umit/db and umit/inventory.

................

Location:
branch/NetworkInventory
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • branch/NetworkInventory

    • Property svnmerge-integrated changed from /trunk:1-560,563-566,574,577-597,599-615,617-618,620-635,641-648,651,653-662,666-667,669-764,766-845,848-964,966-1038,1041,1047-1059,1070-1103,1113-1119,1139,1156-1187,1189,1196-1202,1206-1223,1225-1241,1244-1248,1251-1258,1260-1274,1276-1279,1281,1283-1284,1290-1295,1297-1305,1307-1308,1310-1311,1313-1322,1326,1328-1333,1335,1337-1397,1399-1418,1420-3939,3941-3945,3948-3952,3955-3978,3980-4122,4124-4256 to /trunk:1-560,563-566,574,577-597,599-615,617-618,620-635,641-648,651,653-662,666-667,669-764,766-845,848-964,966-1038,1041,1047-1059,1070-1103,1113-1119,1139,1156-1187,1189,1196-1202,1206-1223,1225-1241,1244-1248,1251-1258,1260-1274,1276-1279,1281,1283-1284,1290-1295,1297-1305,1307-1308,1310-1311,1313-1322,1326,1328-1333,1335,1337-1397,1399-1418,1420-3939,3941-3945,3948-3952,3955-3978,3980-4122,4124-4277
  • branch/NetworkInventory/umit/inventory/ColoredToggleButton.py

    r4252 r4278  
    6363 
    6464        self.add(button_box) 
    65