lp://staging/~mcuelenaere/syncany/trunk

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp://staging/~syncany-team/syncany/trunk

Syncany Team: Pending requested 2012-02-11

Diff: 632 lines (+522/-1)

9 files modified

syncany/README (+4/-0)
syncany/build.xml (+5/-1)
syncany/nbproject/project.properties (+8/-0)
syncany/src/org/syncany/connection/plugins/dropbox/DropboxConfigPanel.form (+42/-0)
syncany/src/org/syncany/connection/plugins/dropbox/DropboxConfigPanel.java (+126/-0)
syncany/src/org/syncany/connection/plugins/dropbox/DropboxConnection.java (+121/-0)
syncany/src/org/syncany/connection/plugins/dropbox/DropboxPluginInfo.java (+57/-0)
syncany/src/org/syncany/connection/plugins/dropbox/DropboxTransferManager.java (+145/-0)
syncany/src/org/syncany/i18n/I18n_en_US.properties (+14/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

63. By Maurus Cuelenaere on 2012-02-11

Add Dropbox plugin

62. By Maurus Cuelenaere on 2012-02-11

Fix project.properties

61. By Maurus Cuelenaere on 2012-02-11

Fix Linux run target

60. By Philipp C. Heckel on 2011-06-27

fix for bug 796055

59. By Philipp C. Heckel on 2011-06-19

merged trunk

58. By Philipp C. Heckel on 2011-06-13

removed nbproject/private in nautilus-syncany 796302

57. By Philipp C. Heckel on 2011-06-13

removed nbproject/private

56. By Philipp C. Heckel on 2011-06-12

UI update bug fix 793588

55. By Philipp C. Heckel on 2011-06-12

UI update bug fix 796060

54. By Philipp C. Heckel on 2011-06-11

fix native client warnings bug - 794006