labofsahil/github-event-dataset-2012 huggingface dataset:
again merge problems
Merge branch 'master' into lukas
quit -> save fixed
Merge branch 'master' of https://github.com/StressYourself/StressYourself into florian
Merge branch 'lukas'
Merge branch 'florian'
new jar
added license, changed engine
Update TokensFileHandler
More important updates
READMEs added + removed some old things..
moving gituser to git-tools so it can be used for all repos.
adapted other css to the new generated html structure
localhost for toxbank-dev
Merge branch 'development' of github.com:ToxBank/toxbank-investigation into development
Merge branch 'development' of github.com:ToxBank/toxbank-investigation into development
delete test folder
Merge branch 'development' of github.com:ToxBank/toxbank-investigation into development
Merge branch 'development' of github.com:ToxBank/toxbank-investigation into development
Merge branch 'development' of github.com:ToxBank/toxbank-investigation into development
Merge branch 'development' of github.com:ToxBank/toxbank-investigation into development
Merge branch 'development' of github.com:ToxBank/toxbank-investigation into development
Merge branch 'development' of github.com:ToxBank/toxbank-investigation into development
Merge branch 'development' of github.com:ToxBank/toxbank-investigation into development
unicorn 4.3.0
change url_for to Sinatra::Helpers to(params[:id])
cs-fixes
replace content with content from another controller
Phrase\ControllerAction
Phrase\ReplaceContent
Updated the ReadMe AGAIN!
mais fixes para  about.php
Remove double code
Add option to not show previews for hidden posts
Fix addLinkImg in previews
Added updated_by_last_action to :run action
add name attribute to metadata
Merge pull request #1 from paulmooring/COOK-1834

Added updated_by_last_action to :run action
release v1.0.8
Correzione postrema
speak once can accept arbitrary room ids to speak into
add initial logentries plugin
old.h
resolução de conflitos ao fazer merge dos testes
(Grazi/Pato) Novo header.jsp
Add threadsafe configuration for OAuth tokens
autres videos: compression avec pertes
fixed the add event bug
got the hover stuff working, still need a way to show length constraints
About to move SupplicantGroup -> Rabble
Successfully completed SupplicantGroup -> Rabble
Change g:codepath to a list to handle multiple acceptable codepaths.
Added status updates.
Updated README with caution about whether the code is any good
updated license infoto be less childish
Consolidate binary file loading into one function in new class, DataStructures.Shared
Rename file
removing test dependencies because needle is not contained in the jboss-repository (other people want to build this too) and not used here anyway
Versão 1.5
Versão 2.0
Add tariff_measure_number to measures.

This is needed to process TAME record operations for prohibition and
restriction measures correctly. We need to operate on measures with
correct tariff_measure_number only.
Merge pull request #14 from alphagov/tariff_measure_no

Add tariff_measure_number to measures.
answer via stackoverflow
Ensure test tables are clean
refactor to DCI. moved the Board role into an object.
extracted board module
move 3.moves logic into the use case
test stub for points
Removed --unit option; s/m/h/d unit character now read as part of --interval argument (like --start and --end now/epoch offsets)
improved the update function
Changing the picture that shows up on facebook - 2
changed to number color
Moving data from Google Code

Old URL: http://code.google.com/p/php-solusvm-class/
Update Read Me extension
Updates for multiple files
take the time which comes from the tracjectory generator and some magic number
Updated examples: added russian examples; fixed google driver for unicode character sets. Refs #4
Updated to h5bp 3.0.  Removed ant-build-script from repo.
Added sassy-buttons

Fixed some conflicting .button-class, for the small-screen submenu drop
down button
Renamed #sidebar to <aside>
Added forms styling, stolen from Bootstrap
Exercise 41.
Added a load generating function
Implementing sort algorithm
Removed temporary 14 col variables file
solved issue, prime_machine
moved problem_6 to solved
Implemented preferences for choosing between possible solutions.
Updateable even more
Adding a size mixin
removing what shouldnt be here
Bugfix _dispatch_rest_method

Code to action lookup key must be based on $rest_method instead of $req
info.
Fix spelling
Update changes
Version 1.04
test commit

added a comment
Revert "test commit"

This reverts commit 7d3e1900dd4b154d42737b88ef6c6e2785851154.
Updated code from email
Added project description pdf
Got javascript working, Build class will need alterations when its written. Added preview styles to screenwebcards.css. Added the demo card to build.rhtml, and removed the php sticky form stuff, since it will be different in ruby.
Update package versions
Update package versions
Merge pull request #4 from vn/patch

Update package versions
Revert new buildPath style.
Update readme to use markdown format
Fix UpdateService to launch NovelContent when notification is clicked
Add external link parser and handler
Closes #14. Added an alias module. Not as cool as a package, but no code dupes.
Added see all videos functionality
Here's the files
TD5Prepa : modifs mineures
added back in the ooyala v2 script
use config to load custom module
updating README markdown formatting
[xorg-x11-proto-ubuntu-devel] Update build script
[gcc46] Not needed in Fedora 18
Added library with grid view and list view.
Pending tasks :
1) Documentation
2) Adjust FrontScreen layout.

Signed-off-by: Chintan Vyas <chintan.vyas89@gmail.com>
Public Release 2

Hardware Changes:
* update to use ATMega32
* Use hardware TWI interface
* Use timer overflow compare pin for buzzer

Software changes:
* Add bytecode interpreter for on-keyboard programs.
* Add USB vendor commands for controlling the keyboard and uploading/downloading key mappings and programs.
* Add compiler for minimal C-like language to produce program bytecode.
* Add GUI client software for remapping and uploading programs.
Update notes for submitted changes

* Updated the cloud controller to use the latest UAA gem.
githubify some things
plone 4.1.5 support, where base_properties is gone
Hacked in a filter_FOO function on resources.  This should be replaced later with something cleaner
Adding default body class
Broke the CSV script up.

It's about time to start using a real programming language ...
Implement 'GetHostPortAndIp' method to get a port + ip address as an env var
added check the length of the ip and port@ip
used EnvVariable class to get  LMX_LICENSE_PATH variable value
Renamed 'altairEnvVar' variable to 'lmxEnvVar'
As tu reçu mon commit ?
PAHMA-204: Add xmlmerge rules for terms-used element.
Add "Alignment" command to Default.sublime-commands -- it was always getting lost for me
Introduce calculateScore() function
Added new XLS and CSV for hitting very date in the Schedule
Whitespace change
Sorted ScheduleEntry list results by Role name
tweaks to features contents
Template on the node type.
added .gitignore

avoid that stupid DSStore stuff
Update README.md to reflect the code's intent better
Fix bug reset_score -> reset_rating
Remove Register link on homepage.
Replace Register button but link it to new player.
Add function to recalculate all scores, and another function to delete a game (not fully functional). Don't show people in rankings list until they've played a game, and always show the current winning / losing streak.
Many updates. Lots of goodies. :)
Ajout d'un type de fichier au gitignore
introduced :if, :unless, and :value options to attribute
Update the introduction of functionality improvement
Switched tabs to spaces.
Updated server instantiation.
Renamed output folder.
Moved source html file.
Allow organized patterns by table of contents; updated html output accordingly.
Added header to output file.
Moved visibility for comments
* update luabinding (win32)
draw target box
Updated config.xml & added icon
Added the files, copied some images from the webz
updated map
fixed markers overlapping the toolbar
fixed layout on small-screen phones,
fire events on MouseDown,
fixed Widget.disposed exceptions
enable multiple speaker for each topic
create TopicController
change log level to WARN
ignore log.roo
remove log.roo from version control
Create Day
Add date field to create date page
add font-awesome
include date in Day creation
my first commit
Merge remote-tracking branch 'upstream/master'

Conflicts:
	log.roo
Added black serpent enemy
Fixed player input
Init project
2
merged lib/uol-shortcodes.php from master
Some mambo jambo vuduu to try get a better gps signal..
rc.firewall6: allow all icmps in
ufw: fix path to ufw-init

FS#28867
refactoring
updated metrics URL
refactoring
developing price streaming
use FX market for streaming
added price stream jitter reporting
use GBP/USD for streaming
change notifier email
Fixed sequential solver
Fixes in handling of the spaces
Aligned readme
retrieve the over rap presented sequence from fatqc data file
Nuke coursework, gpa
Added web page url in readme
cairo-1.12.8-1-x86_64
* Version bump
gnome-screensaver-3.4.3-1-x86_64
* Version bump
nautilus-3.6.2-1-x86_64
* Version bump
Added ptrsafe to declare statements to try to resolve 64bit windows issue.
glorious funtoo updates

merged:

  gentoo: 4e545986174f69273500c72f217060728debc3dc
  funtoo-overlay: 088258b1ebe31ac9c291153662dda62bac4f7347
  foo-overlay: 4e928d47e22991dc209ec57d02372c56ceff4275
  bar-overlay: 6c956f1ca6178fed85bda46013da787239706d7c
  flora: 4cbb9b684d2abac91991502465f21fe8858343c1
  lcd-filtering: dd3d9b094dbfc726ee9b3d886783a18b92f899fd
  mythtv: 00027cc812a879fe67e687843f201cd95e000a94
glorious funtoo updates

merged:

  funtoo-overlay: 30515009abcc605d111c7fb123fef4bdb709547a
  foo-overlay: 49364501b49e209c1e5602ddde1dd6531e118fab
  bar-overlay: 78a0865873ba50e93705d46779fd9344e60a9af3
  flora: 475c1be884ecb24c9925d6cb529178049dd27f2f
  mythtv: 00027cc812a879fe67e687843f201cd95e000a94
Catches exception in DateAttribute
Branched and added custom address to Makefile.
Changed separate API and fixed token bug.
Changed notify API to passing a notification message.
Added Content-Type to observe notifications.
Managed consistent representation generation for /obs.
Added rt filtering for Link Format.
Clean-up and fix for rest-server-example.
Avoid using memcpy on unaligned uint16_t variables, because certain compilers will optimize this code to a direct copy instruction that will result in unaligned memory access. Thanks to Angelo Compagnucci for reporting this problem.
We've not been using the cc2430 converter for a while now
Deleted the old Sensinode 'read mac from flash' routine.

Since the introduction of a purpose-written routine, the old
generic one (which was written in asm) was never being used.
There was a configuration directive which allowed us to switch
between the two. All references to this configuration directive
have also been removed.
Solved a text encoding issue
For cc2x30, moved CLOCK_CONF_SENCOND to the cpu dir.

The value is not really configurable by the platform so having it
in contiki-conf.h didn't make huge sense.
Renamed sensinode-debug to debug
Removed obsolete #if config from cc2530dk's main

Unlike cc2430, the cc2530 RF driver never generates interrupts.
This configuration in main() was a remnant of the porting from
the sensinode main, which does in fact need it.
Also updated comments in contiki-conf to reflect that shortcuts
don't influence the RF
Renamed a config define to better match contiki's naming philosophy
Simplified the CSMA_SHORTCUT spaghetti a bit

* The exact same declaration was in both branches of an #if block. This
has been moved back to where master has it
* Moved a variable declaration from file scope back to where master had it

Those changes also reduce our diff from master
Changed the way we handle NETSTACK shortcuts

Instead of conditionally replacing invocations of stack-hungry functions
we wrap the function itself inside a guard. When SHORTCUTS are defined,
we get rid of the function by defining it as something else across the
board. This has the positive side effect that the optimisation
propagates too all mac/rdc drivers.

This change also reduces our diff from master quite a bit
Merge branch 'master' into cc-ports
Renamed a config define to match changes in master
Finished work on all stats-numbers about SNPs.
Bump transformers to 0.3.0.0
Bump mtl to 2.1
Patch darcs 2.5.2-r2 for mtl-2.1
Loosen mtl dependency in logict 0.5.0-r1
Patch agda 2.3.0.1 for mtl-2.1
Bump adjunctions to 2.2
Bump free to 2.1
Bump leksah-server mtl revdep to 2.1
Bump leksah mtl revdep to 2.1
Bump bifunctors to 0.1.3
Bump blaze-builder-enumerator-0.2.0.3 mtl revdep to 2.1
Bump comonad-extras to 2.1.1
Bump comonad-transformers to 2.1.1
Bump comonad to 1.1.1.3
Bump comonads-fd to 2.1
Bump contravariant to 0.2.0.1
Loosen tagged revdep in crypto-api
Bump data-accessor-mtl to 0.2.0.3
Bump texmath to 0.6.0.5
Bump data-accessor to 0.2.2.2
Bump digestive-functors-snap to 0.5.0.2
Bump digestive-functors to 0.5.0.4
Bump yesod-auth to 1.1.1.4
Remove deprecated http-enumerator, upstream say use http-conduit instead
Bump certificate to 1.3.1
Bump http-conduit to 1.8.1
Bump tls-extra to 0.5.0
Bump tls to 1.0.0
Bump http-conduit dep in authenticate-oauth
[move] dev-perl/Import-Into to ::gentoo
Removed Bluetooth permission from AndroidManifest.xml

It is not needed to control sound playback over Bluetooth
headset.
core: use enum for custom audit log keys

Change-Id: I02a23aa4da2ebee41c9830decd9c99bd487ae6a4
core: clean XMl annotations for VdsNetworkInterface

Change-Id: Iffe30d5726d6ec0a70abc5605790fa62cbf0c9d8
userportal,webadmin: Element ID improvements

Changes in 'gwt-common' module:

- BaseRefreshPanel now supports HasElementId contract:
  refresh button has its element ID set according to
  standard table ID convention, for example:
  "SomeView_table_refreshPanel_refreshButton"

- AbstractSubTabTreeWidgetView's actionPanel now supports
  element IDs, this affects VM Snapshot sub-tab in both
  UserPortal and WebAdmin

Changes in 'userportal-gwtp' module:

- added element ID to connectAutomatically checkbox
  (LoginPopupView)

- added element IDs to header links
  -> logout, guide, about

- Extended main tab:
  -> VM and Templates tab: added element IDs to all main
     tab and sub tab tables, and VM Monitor sub tab
  -> Resource tab: added element IDs to labels

- Basic main tab:
  -> added element IDs to details panel widgets

Changes in 'webadmin' module:

- added element IDs to header links
  -> logout, configure, guide, about

Change-Id: I96afff69eff17f653ec1184782ff4bc1debb545e
Signed-off-by: Vojtech Szocs <vszocs@redhat.com>
restapi: Gluster Resources Implementation classes

All gluster related resource implementation classes. These classes
do not contain any functionality yet. All resource methods throw
NotImplementedException for now, except the ones that fetch child
resources. Subsequent patches will add proper implementation to
the resource methods one by one.

This patch also modifies the ClusterResource and introduces
GlusterVolumesResource as it's child resource.

Change-Id: I18afc04f2501e4bbca272a9b5e18cf33d5ac9187
Signed-off-by: Shireesh Anjal <sanjal@redhat.com>
webadmin: Disable disk HotPlug for IDE interface

Active/Deactivate a disk attached to an IDE interface
should be blocked only when VM isn't down.

Change-Id: I719b3c125fe562b9848d016048ab3e42894bf6ef
Signed-off-by: Daniel Erez <derez@redhat.com>
core: Cleanup GetVdsByNameQuery

Used the new getDbFacade() method.

Change-Id: I42387cf241bd2008eae915a650dde2e6447a70bd
restapi: BZ861929 - Don't require template for clone-vm from snapshot

Change-Id: I5e49482c2777c5fd6d0aa97ba2c4e1b37c2bec2e
Signed-off-by: Ori Liel <oliel@redhat.com>
String location change.
Adding NuGet support

Added NuGet publish support
adding EnumerateIt::Base.to_json
Merge pull request #22 from mhfs/to_json

Add EnumerateIt::Base.to_json
Version bump
Adds rake to the gemspec as a development dependency
Merge branch 'master' of github.com:cassiomarques/enumerate_it
Hashrockets are the standard hash operators for this project
Using JSON.parse for the #to_json spec, so it passes on 1.8.7 too
Ok, let's see if now travis-ci can build this
Version bump
Respect superclass enumerations on subclasses

Previously, this was the behavior:

  class Unico::Person
    has_enumeration_for :gender
  end

  class Person < Unico::Person
  end

  Unico::Person.enumerations
  # => {:gender => Gender}

  Person.enumerations
  # => {}

After this commit, subclasses will inherit the superclass enumerations:

  class Unico::Person
    has_enumeration_for :gender
  end

  class Person < Unico::Person
  end

  Unico::Person.enumerations
  # => {:gender => Gender}

  Person.enumerations
  # => {:gender => Gender}
Merge pull request #24 from sobrinho/master

Respect superclass enumerations on subclasses
Fix require for active_support/core_ext/class/attribute
Version bump
Adding :prefix option for has_enumeration_for
Makes enumerations look more like lists
Bumps version
Move :prefix option to :create_helpers hash
Adds travis build status image
Merge pull request #26 from lerrua/add-prefix-for-helpers

Adding the ability to pass a hash to the :create_helpers option, so the created helper methods can have an optional prefix.
Updating the documentation for the :create_helpers option
Updating docs / readme.
#381 - migration added: avatar and name updated for users
Merge branch 'master' of https://github.com/grzegorznittner/StartupBidder
Added google-analytics to the lab.
-Added Camera class and tests for keyboard input. Fixed Database bug. Started working on input class.

-Next on the agenda is to develop the input library. This is hopefully going to make retrieving user-input much more easier to manage, as well as increase functionality.

-Camera class is mostly completed for now. I do have to add a few more functions to it but for now, anything added will be on an as-needed basis.

-Optimized rotation functions in the Matrix and Vector libraries, also increasing functionality as well. The Math Library now has #define's for often-used Pi conversions. Also added macros for radian to degree conversions; because I can.

-Fixed the bug in the Database library which caused strange line-engine problems. Files can now be opened between Windows and Linux systems with no error in CR/LF input.
Changed nonce size from 32 to 64
Cria o artigo sobre Table Data Gateway e Row Data Gateway
examples: Fix directory determining logic

On libarchive 3.0.1 to 3.0.3, archive_entry_filetype() always returns
AE_IFREG, signifying that all seekable streams are regular files. Look
for a trailing slash to ensure that directories are not falsely
evaluated as regular files.
Removed hero unit for now. Se veia muy charro.
model generator working again
Update content/tutorials/async/deferred/en/index.html

Final tweaks on the article.
Removes the id from reboot since params and require take care of that now.
Merge pull request #31 from ed-/fix-reboot

Removes the id from reboot since params and require take care of that now.
added SwipePanel class files
Update jar and changelog
Added missing basic data on module data_idu
Deleted comment on showIndtroduceDialog()
Don't know what I can test in this class.
If only handlers of buttons.
add userId columnt to community/user module
Merge branch '2.3' of github.com:impresspages/ImpressPages-CMS into 2.3
Add github profile link, add disqus comments
findRotationangles with mat instead of iplimage etc
small changes
Merge branch 'review-rmb-rh'
updated stack.xml
add profile model and profile page
Restructure to be usable as symfony vendor
Fix some headings, todos and add master's thesis general discussion section
Add OntoUSP section
Add open research areas progress
Added Readme

Readme Description added. May need to format differently.
the jquery for expander was surprisingly easy.  Now I just have to write what I want to show up + a bit more styling.
Creacion order cuando la trasaction es aprobada
[maven-release-plugin] prepare release dynamic-axis-1.0.0
Restored -SNAPSHOT to version number.
* added README.
Refractoring of variable names, quick show color in dashboard header
Modified engine.rb
change version to 1.1
snapshot for next release
Add Work In Progress section to intro
Omit ChiliProject's tests
Added fallback for no-auth
Added PHP Other Basic

Added PHP Other Basic(Streams, Tidy)
Completion/Syntax.
master: remove experiments and extra files
Added jayzawrotny to contributors list.
Time input will be formatted with timeFormate on input blur.
Added dmzza to contributors list.
Created check.html to check for exsiting configuration
- do not create alias for new repo, let zypp handle it (bnc#773968)
- 2.17.53
Add snippets for the Processing Programming Language (processing.org)
Merge pull request #110 from visualisierte/master

Add snippet file for Processing
adding a snippets file for puppet code. Originally created by r.i. pienaar
Merge pull request #111 from stefancocora/master

Adding a puppet code snippet
Merge remote-tracking branch 'honza/master'
Added some new todos for key mappigngs, aborting and messages
Changed implementation for cropping
add cleancache
msm cpufreq Improve initial frequency selection - CodeAurora
update bfqv1-r1 to bfqv2
i forgot it
ondemand tweaks
Work in progress - not pong yet!
improve constructor of datum
semc: es209ra typo fix
rename powder-48.png to powdertoy-48.png so it's not confused with unrelated package 'powder'
debian/changelog: updated install path of icon-document-32.png
First pass at Side A
Add album script to generate HTML
Change the titles
Add album artwork
Add Side B
set warpin on greendale-exterior level to "false"
Fix pixel error identified by user in 0.0.35 comments
fix warpin and add animated flag
Add newest track to side b
Merge branch 'master' of github.com:kyleconroy/hawkthorne-journey into soundtrack
Add waving flag
Can't be in the air while talking to Hilda
Merge pull request #57 from jhoff/jump_and_talk_to_hilda

Can't be in the air while talking to Hilda
Pot breaking sound
Fix #310
Merge pull request #311 from jhoff/pot_breaking_sound

Pot breaking sound
update mount-py.py
v0.2
Исправлена сборка под linux
Добавлено предупреждение о форматах дат
Добавлен вывод заголовка дампа
Trying another travis path.
fixed navigation bug. was missing a </div>
removed the sequencegenerator
Flavor 1 doesn't exist for Rackspace v2, use 2 as default
random led blink using last bit of fibonacci leniar feedback shift regiter
changed url of template zip
Moved old materisl to a dedicate folder
Merge pull request #317 from marcoAntonioNina/2.0-testing

BUG 8831 Backslash ( \ ) appears before single quotes in Case... SOLVED
BUG 9072 It should not be the option "SendFiles" SOLVED

- I removed the option "SendFiles"
Merge pull request #320 from brayanpereyra/2.0-testing

BUG 9072 It should not be the option "SendFiles" SOLVED
CODE STYLE workflow/engine/templates/setup/webServicesTree.php
Merge pull request #321 from brayanpereyra/2.0-testing

CODE STYLE workflow/engine/templates/setup/webServicesTree.php
BUG 8904  Notifications does not work when using a language... SOLVED

- Was verified that skyn and language were hardcoded.
- Were modified the skyn and language of the files.
init checkin
Merge branch 'master' of github.com:markberryman/TddMultiCurrency
Merge pull request #24 from martinusadyh/master

Fixing tampilan dialog
kartu anggota ditambahin logo smpn 25 bekasi
Merge pull request #17 from sulistionoadi/master

Modul Anggota
Database refill
Merge branch 'mathijs' of github.com:martndemus/nhl-stack-overflow
Added useful helpers, removed the old ones
error message font color
-interface XMLRMISerializable
removed redundant hard-coding
Ajustando o banco de dados para o Heroku.
Revert "Banner encoding fix when running against dd-wrt on ruby 1.9.3"

This reverts commit 89d5af7ab2fe1ce31cd70561893d94bb73f3762c.

Telnet banner parsing restored
Add DNS/TCP to enum_dns
added ezserver <=6.4.017 bof for winxp sp3
Add IE 8 targets
Additional changes
corrected a typo, "from from" to "from"
Merge branch 'dns_enum_over_tcp' of https://github.com/sempervictus/metasploit-framework into sempervictus-dns_enum_over_tcp
Added a bit of verbosity to SMB capture module to enhance logging and post exploitation
fix all changes suggested by jvazquez-r7
deleted the module from root msf path
Add a check for distcc_exec

Just executes the exploit with an "echo <random>" payload to see if it
works.
Merge pull request #500 from modpr0be/module-ezserver

added ezserver <=6.4.017 bof for winxp sp3
minor fixes
Merge pull request #505 from jvazquez-r7/ezserver_ready

minor fixes to ezserver_http.rb
Add a simple module for testing cmd payloads
Permissions, ignore
Correct the description to mention IE8 on Windows 7
Merge branch 'distcc-add-check' of https://github.com/jlee-r7/metasploit-framework into jlee-r7-distcc-add-check
Merge branch 'test-cmd-payloads' of https://github.com/jlee-r7/metasploit-framework into jlee-r7-test-cmd-payloads
Fix the fix for enum_dns
Correct information in the README
Fix regarding the API change of wbsearchentities

wbsearchentities will return the key "label" instead of "labels" again; Since wbsearchentities returns an array for the aliases now (even if there are no aliases), handling the returned object in the entityselector widget is adjusted accordingly.

Change-Id: I229fe4f7ab3155b4afe2bd604b73c4b9d239fd23
Merge "Fix regarding the API change of wbsearchentities"
game of life overhaul
Fix Track tests
Merge branch 'master' into beta

* master:
  Fix Track tests
MBS-4767: Fail edits that try and change the release group primary type to one that does not exist
Merge branch 'mbs-4767'

* mbs-4767:
  MBS-4767: Fail edits that try and change the release group primary type to one that does not exist
Merge branch 'master' into next

* master:
  MBS-4767: Fail edits that try and change the release group primary type to one that does not exist
MBS-842, add a "reset track numbers" button.
Forgot to add socket.io to package.json
added initial implementation for OkCancelButtonArranger
made OkCancelButtonArranger look for caption of found buttons; added GetWindowText to PInvoke
made OkCancelButtonArranger determine the position of found ok button
made OkCancelButtonArranger move the ok button (even if not correct position)
made OkCancelButtonArranger move the ok button but keeping the width
made OkCancelButtonArranger move the ok button but keeping the height
made OkCancelButtonArranger move the ok button to new left offset
made OkCancelButtonArranger move the ok button to new top offset
made OkCancelButtonArranger look for caption of cancel button
made OkCancelButtonArranger determine the position of found cancel button
made OkCancelButtonArranger move the cancel button but keeping the width
made OkCancelButtonArranger move the cancel button but keeping the height
made OkCancelButtonArranger move the cancel button to new left offset
made OkCancelButtonArranger move the cancel button to new top offset
extracted WithOkCancelButtonArranger
merged establish of specs for cancel button arranging into WithOkCancelButtonArranger
fixed the missing subtraction of width of cancel button for new left offset of ok button
optimized the used values in specs for OkCancelButtonArranger to make it more understandable
moved OkCancelButtonArranger from specs to actual implementation project
changed order of button movement due to some graphic issues
just trimming some fat…
Added the deployed application endpoint to af
changedFirstHour
Change Bookrenter to Rafter
Add PYTHONPATH to exec task of monkeyrunner.
Merge branch 'fix-integration-test'
Add defaultTimeout.
Merge branch 'feature-default-timeout'
improved tag getter
jeje
Don't use deprecated function

milter-headers.c:281:9: warning: 'g_strcasecmp' is deprecated
generate BloggerBlogBundle
Fixed configuration form
calculate byte length of data
Bug 49474 - Filter editor UI: make Enter key add a new criteria line instead of OK-ing the dialog. ui-r=bwinton, r=mconley, r=IanN
Bug 466276 - .caf files grayed out (not selectable) in Preferences > General > Use the following sound file > Browse. r+ui-r=bwinton
Bug 742524 - Let users dismiss Filelink upload notification permanently. r+ui-r=bwinton
Bug 784797 - Excessive left margin in conversation pane. r=florian, ui-r=andreasn
Bug 787433 - IRC component should return a proper CTCP VERSION response. r=aleth, florian
Bug 711750 - Implement a fullscreen arrow for some windows in Thunderbird for 10.7 and above. r=bwinton.
Created empty GameEngine, GameLogic class
Merged CI and CMake config from master
pwswd: lower the priority of the startup script.

The power switch daemon has to be started after the ALSA config
has been loaded; otherwise, it may crash as soon as the volume
shortcuts are used.
toolchain: bump gcc 4.5 series to verion 4.5.3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

Conflicts:

	toolchain/gcc/4.5.1/100-uclibc-conf.patch
	toolchain/gcc/4.5.1/301-missing-execinfo_h.patch
	toolchain/gcc/4.5.1/302-c99-snprintf.patch
	toolchain/gcc/4.5.1/305-libmudflap-susv3-legacy.patch
	toolchain/gcc/4.5.1/810-arm-softfloat-libgcc.patch
	toolchain/gcc/4.5.1/820-arm-unbreak-armv4t.patch
	toolchain/gcc/4.5.1/830-arm-pr43440.patch
	toolchain/gcc/4.5.1/850-arm-pr44392.patch
	toolchain/gcc/4.5.1/powerpc-link-with-math-lib.patch.conditional
	toolchain/gcc/4.5.2/100-uclibc-conf.patch
	toolchain/gcc/4.5.2/301-missing-execinfo_h.patch
	toolchain/gcc/4.5.2/302-c99-snprintf.patch
	toolchain/gcc/4.5.2/305-libmudflap-susv3-legacy.patch
	toolchain/gcc/4.5.2/810-arm-softfloat-libgcc.patch
	toolchain/gcc/4.5.2/820-arm-unbreak-armv4t.patch
	toolchain/gcc/4.5.2/830-arm-pr43440.patch
	toolchain/gcc/4.5.2/powerpc-link-with-math-lib.patch.conditional
	toolchain/gcc/4.5.3/100-uclibc-conf.patch
	toolchain/gcc/4.5.3/301-missing-execinfo_h.patch
	toolchain/gcc/4.5.3/302-c99-snprintf.patch
	toolchain/gcc/4.5.3/305-libmudflap-susv3-legacy.patch
	toolchain/gcc/4.5.3/810-arm-softfloat-libgcc.patch
	toolchain/gcc/4.5.3/820-arm-unbreak-armv4t.patch
	toolchain/gcc/4.5.3/830-arm-pr43440.patch
	toolchain/gcc/4.5.3/powerpc-link-with-math-lib.patch.conditional
	toolchain/gcc/Config.in
a320_defconfig: updated defconfig to match config changes.
a320_defconfig: include Python in the rootfs.

Some modules have been included: zlib, expat, sqlite, curses readline.
a320_defconfig: added Pygame to the rootfs.
dialog: added a patch to fix crashes occuring on user input
opendingux: don't log the output of the GMenu2X binary.

This prevents the console-based apps to work correctly.
opendingux: Don't re-enable the framebuffer console in case of an error.

That's pointless, since GMenu2X re-starts itself directly after the
program issues its error.
opendingux: added the "system_info" script.
opendingux: Allow local binaries to override versions from the rootfs.

Changed the search order in $PATH to allow this.
opendingux: Use "tvout" binary from $PATH from pwswd.

This allows a binary in /usr/local/sbin to override the one in /usr/sbin.
opendingux: Make PAL-60 the default TV standard instead of PAL.

A lot of games and emulators are written to work best on 60 Hz and all
non-ancient PAL TVs seem to support PAL-60.
Merge branch 'opendingux-2010.11' of git://github.com/Ayla-/opendingux-buildroot into opendingux-2010.11
a320_defconfig: Go back to GCC 4.5.x, uClibc 0.9.31 and binutils 0.20.1.

Various issues pop up when using more recent versions. Until we figure
out solutions to them, it's better to revert the default config to known
working versions.
discard Atomikos logging output
working memory store but need clean up
Play title filter loading.
actualizacion empleador
BMesh TODOs: use loops/polys instead of tessfaces.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@45216 954f8c5b-7b00-dc11-b283-0030488c597c
Fix related to #30674: 2D image painting would do unnecessary full GL texture
delete at the end of the stroke, even when doing partial updates.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@45217 954f8c5b-7b00-dc11-b283-0030488c597c
removed use of findTypeTableId and using the db instead

Signed-off-by: nischayn22 <nischayn22@gmail.com>
Change '%define' to %global to avoid confusion.
Move _with statements to  %if statements.
More _with sanctificaton.
More with synchronization
Ongoing _with syntax changes.
Eliminate trailing whitespace in filtre-requires.sh.
More with_ integration, and make_check cleanup.
Clean up remaining with_system_sqlite
Learn to spell 'with_bash_completion'.
Spell CollabNet correctly again.
Change dependencies for libmagic and gnome-keyring-devel
to use .h files, instead of package names, because package names change
between RHEL and fedora releases.
Merge dbus-devel exclusion with gnome-keyring-devel exclusion.
Use more release independependent gnome-keyring.h depencency.
back to midi instead of
Added UTF-8 encoding of source in artist method.
more Mappy CSS changes
more Mappy CSS changes
Working version, still missing daemon tools and installation
progress. NOT DONE.
fix del transparency pop up for topMenu
I give up on java, trying wxwidgets
testing device communication
Fix case on MIME type queries in scripting example.
Make sure admins can't disable themselves in views.py - See #9630
Merge pull request #366 from will-moore/web_admin_9630

Make sure admins can't disable themselves in views.py - See #9630
Update notes for submitted changes

* zuul dependencies update
Use zuul_post trigger instead of zuul trigger.

Change-Id: Icf8d555e2f072c73bdd4748cb4a314ec30b37838
Merge "Use zuul_post trigger instead of zuul trigger."
Update notes for submitted changes

* Don't run the tarball jobs for core projects on tags.
Update notes for submitted changes

* Fixes bug 1045777.
Set normalized directory path as parameter.
Remove dynamic variables.
working institution extraction with corpus
lil name changes
all tests working
working with lowcase
Genaralize the downloader task
Output test files to test_assets folder
Add app, test_assets, tests folder to .couchappignore template
Make .couchappignore a template
Applied jfriedly's typo fixes

From here:
https://github.com/jfriedly/bedrocklinux-website/commit/1be0e99c8b8f4e487a1def7de1bcc0483e40bfd3

Thanks, Joel.
Added QSharedPointer
fixed orientation resizing bug
Merge branch 'master' of github.com:pbeardshear/Energy-Management
creating reservations and trip associations
Bugfix #42 Resolved
Ingoring .espresso project directory
version changed to 1.2.0.2000
version changed
PMO-2021: removed default argument for periodIndex
releasing new plugin version 1.5-ALPHA-4.4
using branch specific plugin directory
releasing new plugin version 1.5
releasing new plugin version 1.6-ALPHA-1 (corresponds to 1.5)
releasing plugin version 1.5-kti
safer inserting of collector mappings
Started work on the MovieInfo view.
Removed diagnostic messages
Merge pull request #27 from icydee/develop

Removed diagnostic messages
up to 2.1.4, released 2012-11-29 (no code changes)
Added note functionality as per request
fixed mistakes
Remade using OOP
removed unneccessary files
removed unneccessary code
fixed spelling errors, made variables more semantic
added integration with PSUPerson
continued to add psuperson integration
Fixed for codereview
removed comments
Fixes for codereview
removed an unneccessary file
Merge pull request #284 from drallen1/281-notes

APE: add/edit/delete notes about a user. Fixes #281
Changing Priority to state and Priority
Moving forward with adding in call_state
The ability to save a state now exists. Woo Hoo
Resolves #342, call log state added. additional states added.
Resolves #342. State was added and additional fields were added aswell.
Merge branch 'master' of git://github.com/plymouthstate/plymouth-webapp into 342-additional-status-fields

Conflicts:
	webapp/calllog/templates/style.css
Resolves #342, Call state added with additional fields.
Resolves #342. Call State added and additional fields inserted.
Resolves #342, call state added with additional fields.
Update for iPad
Merge pull request #351 from tfermm/342-additional-status-fields

Resolves #342. Call state added with additional fields. Fixes #342.
Removed a minus sign that was messing up entry.
Merge pull request #343 from nrporter/316-stupid-minus-sign

Fixes 316. Removed a minus sign that was messing up entry.
added some apply()
Transactions added
Melhorado mais um pouco a segurança do servidor
Modificado a busca, adição e remoção de palavra chave
Set the new problem end date to default to 2 weeks from present.
fixes #1072: adds a new resolrization job for resque; adds a rake task that puts this job on a queue; adds resolrization task to deploy scripts
Merge branch 'master' of github.com:quicksilver/Transmit-qsplugin
Merge branch 'master' of github.com:quicksilver/Transmit-qsplugin
Activate Transmit when connecting to a URL/favourite
Use less state
Update wro4j
Clean MDC after the request
fix init script : forgot some dependencies
Removed a stray char
Added previous images scroller
a
gh-1602 Keep original code order

Cleanup in previous commit changed execution order slightly. I don't
believe this would have any real impact but as it was supposed to be
purely cleaning up the code with minimal change/risk, better to preserve
it.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
improve readme todo list and remove bad output from the ddl
Headings link to latest content in sidebar
Endorsement weight and header
Omniauth facebook initializer
Added Jetty, ext libs

More REST
Merge branch 'master' of github.com:rnentjes/Simple-forum-example

Conflicts:
	src/nl/astraeus/forum/web/ForumServlet.java
Merge branch 'master' of github.com:rnentjes/Simple-forum-example
Added toolbar addition ability
Get environment variables and set as java properties.

Previously, I had returned system variables, turns out I meant to read environment variables.
Adds facebook oauth
Adds correct routes
inclusão da lib mpdf51
inclusão de arquivo no css
inclusão de arquivos js 
inclusão de arquivos js
alteração no view.yml
changes for advanced search form changes to results page to allow Kris more access to the form elements
Se amplio la ventana para que se muestren todos las celulas
Add echo client
url for drop vs reject
Adding in the icons from Chris - fixing lighthouse issue 8
Very simple my-events view at /events/mine
Fixing geocoding request URL
Ammending the carousel order
Update to the index page
Merge pull request #28 from rossbruniges/dev

Merge Dan's pull request into dev
Merge pull request #30 from rossbruniges/dev

Fixing unclosed <li>'s in the nav
Merge pull request #29 from mozilla/dev

Adding in a page for the code sprints (dan), fixing unclosed elements in the nav (ross)
Merge pull request #31 from sinker/master

typo fixed on code sprints page
Merge branch 'master' of github.com:mozilla/mozilla-opennews
codesprints page is now highlighted in the nav when page is being viewed
Merge pull request #32 from rossbruniges/master

Couple of nit picks
adding the actual source page, duh duh duh
Merge pull request #34 from rossbruniges/dev

Merge/fix of Dan's pull request and adding in a secondary RSS for source
Merge branch 'dev'
Change the source RSS url to the live version
Removing the source RSS list until we fix the RSS feed linking to the correct URLs
Merge pull request #35 from rossbruniges/master

Merge into master from dev
Re-submitting the source sidebar
Merge pull request #36 from rossbruniges/master

Getting the source RSS feed back
reconciled local and git versions
updated the fellows page
create the 2013 page add in images for all new fellows
added small images for sidebar, updated sidebar
prismatic is energy armor too
Merge branch 'master' into gh-pages
Add EHP dodge to alternatives, set blur to melee_only, display alternatives on all options
Merge pull request #14 from kdmcclel/newui

Small Changes
Uploading files I've worked on so far

HTML/CSS/JavaScript and bg image.
Add /profiles
Ajout du rebond sur le splash screen
Ajout du rebond sur le splash screen
LPS-25795 Journal Folders Backend
LPS-25795 Autogenerated
LPS-25795 Source formatting
LPS-25795 (Autogenerated) Source formatting
LPS-25795
LPS-25795 Autogenerated
LPS-25795 JournalFolderFinder
LPS-25795 JournalFolderFinder (Autogenerated)
LPS-25795 getFoldersArticlesCount
LPS-25795 getFoldersArticlesCount (Autogenerated)
LPS-25795 Move from JALSI to JFLSI
LPS-25795 Source formatting
LPS-25795 Autogenerated
LPS-25611 Copy from view.jsp
LPS-25611 Create general view
LPS-25611 Add button
LPS-25611 Folders frontend
LPS-25611 (Autogenerated) Folders
LPS-25795 Finder (kudos to juanferrub)
LPS-25795 Support for folder in searches
engage: notification routes.
Section DD updates when course DD changes
Upload page now handles audio and video
Merge branch 'mike-upload-media'
error messages for upload type and size
Merge branch 'master' of github.com:sfu-innovation/project-xavier
Made videos load the first time page is loaded
Merge branch 'mike-accent-chores'
engage: get target user from profile page
Merge remote-tracking branch 'origin/master'
Engage: splash page placeholder
Merge branch 'master' of github.com:sfu-innovation/project-xavier
Merge branch 'master' into cat-engage
updateQuestionById allows description to be changed
Merge branch 'master' of https://github.com/sfu-innovation/project-xavier
packages: Build 201211280521 of shr 20121128 for machine om-gta04 on jama
images: Build 201210050631 of shr 20121005 for machine nokia900 on h1987041.stratoserver.net
Updated activity types and added controller to return them
Merge branch 'master' of https://github.com/silves89/SWBath-SportsTracker
Splash screen image loading correctly from inside JAR
Minor changes to hashing and cache aging algorithms.

Hashing was changed slightly to exploit the fact that a significant amount of real world JSON strings / keys will have a high percentage of ASCII characters.

Cache aging was modified to use an AIMD (additive increase, multiplicative decrease) policy.  When an item is found in the cache, its age is incremented by one using saturating arithmetic.  Ages are "quasi-randomly" aged using unsigned right shifts, or in other words its age is divided in half. Since ages decrease far more quickly than they increase, the cache can quickly adapt and converge on the "hot set".
view_classes.php added to admin sidebar
bad filter
gustavo y yo arreglamos cosas
gustavo y yo arreglamos cosas
merge
Added NectarCollector and StingPatrol classes.
changed shebang to #!/usr/bin/env python
additions to home, menu and customer menu
added skeleton methods for suggestion
Merge branch 'master' of github.com:steffenrs/Find-My-Sports-Mate
some more eca_catalogue rename fixes
First commit. 1.4.5 compatible.
using bundler, added hacks for reindex
refs example 1
refs example 1
refs añadido el poll bundle
Revert "Oqe"

This reverts commit 37bd51ffc163612b6c568875c6b7ace6d0e869fa.
Restrict version of formtastic to fix bug with devise: https://github.com/gregbell/active_admin/issues/1240
Show random languages on greeting page.
Bugfix in starter-kit: sudo-edit

Should use capital "P" as interactive argument here.
Merge pull request #148 from dajva/dajva/sudo-edit_patch

Bugfix in starter-kit: sudo-edit
initial commit
Add VIVOW and Inc properly
Fix derpage
Add Inc back after derpage
Bring in Evervolv proprietaries for Supersonic
Build LiveWallpapers
Add bravo vendor files.
Merge pull request #1 from K900/master

Add vendor files for bravo
remove all pyramid files so we can track separately
Shameless kang of aeroevan's stuff
Shameless kang of Evervolv's vendor for Supersonic

Change-Id: I932b48d5ef6f6c09b07d40aadf764126dd606379
Merge branch 'ics' of https://github.com/tectas/proprietary_vendor_htc into ics
delete utils file
modified russian locale
Merge pull request #15 from Mik-die/locale

modified russian locale
Keystone: fix dependencies

Keystone needs a few things to run.
Were these missing because they are pulled in by something else?

Also, stop python-keystoneclient from blocking keystone.
I assume that it's probably a good idea not to have the server and
the client on the same machine, but is there an actual problem
of having the two together? (e.g. file conflicts)

I'll try it anyway, because I need to test that this thing works and I
cba to boot up a new machine.
add backwards compatibility for <2.2
Spelling fix in description of Flight Talisman.
Fixed SVG usage in IE9+
Revert "Revert "merged commits""

This reverts commit c662f5e76e4b8c54816eb9b0a01d076006be2189.
Revert "Revert "merge attempt""

This reverts commit 17c7baaaa0014d99db290e79890ff0644e2e97e0.
Initial skeleton
Merge branch 'master' of github.com:toddhgardner/CodeSlingers2012
Commiting initial factory code
Finished factory pattern
Dagbladifisering av Bootstrap:
* Lagt til Guardian Egyptian som headingfont.
* Justert tekststørrelse og linjehøyde.
* Justeringer av farger.
* Lagt til spesielle stiler for Dagbladetlogoen i 'navbar'.
mer finpuss på slides
faster mass get or create, with an added transaction
UbuntuDrivers/detect.py, _check_video_abi_compat(): Disable NVidia driver if X.org's log shows that the Intel driver is loaded. This prevents breaking hybrid systems as long as the NVidia driver and X.org do not work on those.
Use HealthPercent(), not Health(), to test for health percent thresholds.
Added some styling
Merge branch 'master' of github.com:unepwcmc/vis_challenge_dugong

Conflicts:
	css/styles.css
initial commit
fixed compatibility with entity_crud_ui
sparse_poly::square_div, sparse_poly::primitive_gcd
modular.hpp and etc...
improve an error message
0.0.2
fixed planner_controller spec
ExternalDB Module
Gadget Title
Change before_filter to prepend_before_filter in Resource.skip_authorization_check
Add Magento observe snippet
user's home directory was not created
进一步更新工程模板
OK
Submitting SublimeLogger v 0.1 plugin to Package Control.
Merged pull request #388 - added SublimeLog
+ Creating debian mods for distro: oneiric, rosdistro: groovy, upstream version: 0.3.0
+ Creating debian mods for distro: precise, rosdistro: groovy, upstream version: 0.3.0
+ Creating debian mods for distro: quantal, rosdistro: groovy, upstream version: 0.3.0
Imported Upstream version 0.3.1
Merge tag 'upstream/0.3.1'

Upstream version 0.3.1
+ Creating debian mods for distro: oneiric, rosdistro: groovy, upstream version: 0.3.1
+ Creating debian mods for distro: precise, rosdistro: groovy, upstream version: 0.3.1
+ Creating debian mods for distro: quantal, rosdistro: groovy, upstream version: 0.3.1
Fixing an issue where clicking on some elements or tabbing outside the input field would not close the timepicker dropdown.
Re-jiggered the registerConstraint code in ConstraintsGrailsPlugin. Newly created constraints will correctly register in an already running app now.
introduced ConstraintApi, which is used by MetaClassEnhancer to provide the metaclass magic to validate closure. The RequestConstraintApi uses current web request to get a handle on the CustomConstraintClass being executed. This new functionality obseletes the manual metaclass stuff in ConstraintGrailsPlugin.setupConstaint, so it and its supporting stuff in CustomConstraintFactory + DefaultGrailsConstraintClass have been removed.
MockConstraintApi implemented, which simply delegates to a unit test that has been injected with ConstraintUnitTestMixin. Aforementioned class updated to use this Api for enhancing constraint under test (CUT, hehe).
Merge branch 'improvedautoreloading'
Merge branch 'constraintapi'

Conflicts:
	ConstraintsGrailsPlugin.groovy
Don't need the aosp review
Basic manager, and I mean BASIC.
fix the "TeamOne Home" in index again
First shot in managing translations client-side
End ui after feature delete
Add unittest `test_quick_update_POST`
Added: List Iklan User
blank initial title
Changed 127.0.0.1 to localhost

127.0.0.1 does not work on some systems. Using `localhost` is much
better.
Remove num of slider!
add last commit to this folder
Issue: Converting project from a packaged app to a new packaged app, with all it's new problems
Command line to update Eclipse plug-ins on automated-build (+ downloads).
updated settings and configuration.
Regex matched too many thing