labofsahil/github-event-dataset-2012 huggingface dataset:
now i have to commmit these
Merge branch 'master' into jesse0805dev
Made some changed to initialization on the client side, added  some code
to update the board after a move. Getting a NPE when making moves
though...
fixed an exception that was happening on the first move because the last
action wasn't available
commit so that i can pull to see if bug fixed will fix my bug
try again
tokens display for rock paper scissors. However whichever button is
clicked first is throwing a null pointer. 
getting ready to commit to get the new stuff
removing .properties *again*
removing .. again
commit to merge
Merge branch '08-06jmaster' into JEBranchofjesse0805dev

Conflicts:
	skrull-base/src/skrull/game/model/AbstractGameModel.java
	skrull-client/src/skrull/game/view/ClientInputHandler.java
	skrull-client/src/skrull/game/view/GameClientView.java
	skrull-client/src/skrull/game/view/RockPaperScissorsPanel.java
	skrull-client/src/skrull/game/view/TicTacToePanel.java
	skrull-client/src/skrull/game/view/UserPanel.java
	skrull-client/src/skrull/game/view/WinnerPanel.java
Sphere-Generation added
Image client prints world coordinates
QApplication created once in qt __init__. Seems to solve test segfault problem
Add support for regex filter on key and value.
Added store_id column to products
adding in indexes to the ingredients and tools
add vim-ff
Auto-complete for ticket linking. Refs EMP-81
test logging: log header for a standard out/err event only once per test method, not for each TestOutputListener event

- added missing class
Fix test failure caused by error message change.
Changed ArtifactPublicationServices to not be stateful (don't maintain a repository handler), and to be able to create a publisher for an arbitrary iterable of resolvers.
Cleanup after bad change: 6ef0a383e5e9317cec0125d69ddb081180f9dc93 - When using closures for with a listener broadcast, they cannot be treated as actions.

Lifted ClosureBackedMethodInvocationDispatch up to be a top level class and made it the caller's responsibility to create one of these.
docview: fixes a memory leak.
memo: removes unnecessary code. The Memo field was just a reference.

This also fixes a strange "lost pointer reference" issue under Windows. Not sure what
FPC is doing there.
docview: fixes a memory leak in font handling.

We checked for the same fontdesc, but never for the same instance. So the NewFont
instance might not have been freed, causing the memory leak.
changes param type from String to TfpgString
added datastream view implementation
Added some build files
Added gitignore
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
removed dependancy on mock user object
refactored some variables and templates
removed the call to file_directory_path from admin inc
updated default template file and preprocess functions
updated template files islandora module now iterates over multiple arrays
create utils datstream inc
Addding add stuff
Merge branch '7.x' of github.com:Islandora/islandora into 7.x-jon-ingest
Added some more menu stuff
added theme suggestions so we can override templates
added some comments and cleaned up code based on coders feedback
added basic collection module and code cleanup
Merge branch '7.x' of github.com:Islandora/islandora into 7.x-jon-ingest
Added mimeclass
added default edit template and default css files
Filled out the purge/delete object callback
Acrescentado o validador no cadastro de disciplinas
Merge branch 'master' of https://github.com/grupo3rpv/rpv.git
Commit relacionar nivel interesse professor->disciplina
Added SQLite clafer model (incomplete for now).
Example for http://gsd.uwaterloo.ca:8888/question/623/display-compiler-errors-in-html-rendering
added CHANGES and LICENSE to deployment. Added extra-source-files to cabal.

Strangely, Extra-Source-Files: does not work with cabal install --bindir
Fix for http://gsd.uwaterloo.ca:8888/question/426/type-system-fails-when-a-unary-operator-is-given
Deref ClaferId accesses when necessary.
Deref for =,in,etc. functions when needed.
Merge branch 'master' of github.com:gsdlab/clafer
album owner can delete pins
Made ipython on localhost run same arguments as when connecting to remote.
forgot to change DB replacement string
fix get log
Removed unused .nunit file
Check for sphinx-build before building documentation
str memory free
py bindings -- camera pipe working, use image_io in py bindings
py bindings -- make camera pipe not use uniform images
add config.php to .gitignore, remove from repo
AIX runtime linking allows undef syms by default.

* libltdl/m4/libtool.m4: When AIX runtime linking is active, undefined
symbols are allowd by default: define the 'no_undefined_flag' instead of
'allow_undefined_flag', to actually let the -no-undefined switch have
any effect in this case.
Correctly expand commands when export_symbols_cmds starts with 'word'.

* libltdl/config/ltmain.m4sh: When export_symbols_cmd starts with some
'word', 'word' is joined with 'concat_cmds' to 'concat_cmdsword' due to
different expansion time: Need to embrace concat_cmds variable even for
export_symbols_cmds.
Define the 'aix-soname' feature.

libltdl/m4/ltoptions.m4: Add 'aix-soname aix-soname=compat
aix-soname=no' LT_INIT options.
Add '--enable-aix-soname' configure option, default 'no'.
Declare 'aix_soname_member_spec' libtool variable.
Prepare -dlopen option for 'aix-soname' feature.

libltdl/config/ltmain.m4sh (func_mode_execute): When testing if the
file to be dlopen'ed exists for -dlopen options, strip the AIX archive
member name along aix_soname_member_spec (when defined).
Do not remove aix-archive-members in mode clean.

build-aix/ltmain.m4sh (func_mode_uninstall): Do not remove the AIX
archive member, but the archive file only.
Run versioning checks on aix with 'aix-soname'.

* tests/versioning.at: On AIX, when aix_soname_member_spec is defined,
run the versioning check.
Support 'aix-soname' enabled shared libraries.

* m4/libtool.m4: On AIX, upon --enable-aix-soname configure flag, enable
runtime linking, and do filename-based shared library versioning with
.so library filenames, which are used with runtime linking only.
Define correct hardcode settings with 'aix-soname'

* libltdl/m4/libtool.m4: Using Import Files (with aix-soname), both
hardcode_direct and hardcode_direct_immediate are 'no'.
Detect XFAIL based on hardcode configuration.

* tests/deplibs-ident.at: To define whether this test should XFAIL, use
hardcode_action, hardcode_direct, hardcode_direct_absolute configuration
settings instead of platforms aix, hppa-hpux, interix or openbsd.
Support loading shared library archive members.

Applicable for AIX only.
* libltdl/m4/ltdl.m4: Define LT_SHARED_LIB_MEMBER using the value of
aix_soname_member_spec.
* libltdl/ltdl.c: When LT_SHARED_LIB_MEMBER is defined, allow for
specifying an archive member as the to-be-loaded shared object.
Prefer to load the LT_SHARED_LIB_MEMBER when applicable.
* libltdl/loaders/dlopen.c: Flag RTLD_MEMBER for dlopen when the
filename does contain an archive member between "()".
Avoid tests with undef syms on aix.

While AIX does support undefined symbols in general, undefined symbols
in one shared library do not trigger another shared library to be marked
as needed.
* tests/template.at: Skip test with undefined symbols across libraries.
evaluate libtool-config within AT_XFAIL_IF
enable 'aix-soname' for libltdl
added a link to IRC and twitter
disable camel and fabric snapshots for now
some change
fix bug
fix compile errors, test
ignore failed gsub in rendevous fixup
Use new SSL endpoints API namespace

The SSL endpoints API being in the v3/ URL namespace never really made
sense, so this change moves the Gem over to a more consistent SSL
endpoints API before certs goes GA.

The old `v3/apps/:app_id/ssl_endpoints` namespace will continue to
function normally for the time being for all clients who used certs
throughout the beta period.
Merge pull request #295 from brandur/brandur-ssl-endpoint-api-namespace

Use new SSL endpoints API namespace
added timer code to job message port
Added chemical formula rendering for specified molecules to math template tag.
Included a server alias for www. prefix in the apache2 configuration.
Added a lifespan app with first model definations.
Properly stop module and trajectseeder
seeding issues...
okkk
Merge branch 'master' of github.com:hiboys/web2.0
///
add .gitignore
kucho-daemon initial commit
Merge branch 'master' of https://github.com/higepon/kucho
Merge pull request #82 from hintjens/master

zsockopts no longer breaks if it hits a ZMQ_ macro that's undefined
Fixed issue #83
Merge pull request #42 from hintjens/master

Implemented binary logging protocol
generate java ZreLogMsg class
Add java ZreUdp and test
Merge pull request #43 from miniway/master

java ZreUdp and test
change peer sequence type as unsigned
issue #45, deliver the event which peer joined/left a group
Merge pull request #46 from miniway/master

deliver the event which peer joined/left a group
fix bug at group joined/left message
Merge pull request #47 from miniway/master

fix bug at group joined/left message
first working draft of java zyre
Merge pull request #48 from miniway/master

first working draft of java zyre
Merge pull request #49 from hintjens/master

Updated readme
Fix uninitialised variable warning/error.
Merge pull request #50 from shancat/fix_warning

Fix uninitialised variable warning/error.
Small renames to command fields
Added logging
Renamed command fields
Renumbered commands
Running directory configuration improvements.

This addresses Issues #172 and #185.
 1) Redirect suite stdout and stderr to file.
 2) Make only the top level suite run-directory configurable
 3) and configure it via the new site/user config files.

GUI access to new redirected suite output.
Fixed restarts (broken by the previous commit).
Another small correction.
And another small correction.
Cylc ping need to contact suite if port file exists.
The suite definition file path is no longer needed in gcylc.

It was previously there because we had to parse the suite to find the
log directory (and similar), but that is now in site/user config.
Allow n*d in retry delays list. Addresses Issue 179.
Update task retry documentation.
Removed automatic task state alteration on restart (Issue #117).
Cleaned up the silliest bits of task_state internals.

(more could be done...). This change should have no functional effect.
A bit of exception handling in task_state.
Merge pull request #186 from hjoliver/cylc-run-dir-config

Running directory configuration improvements.
Merge pull request #187 from hjoliver/cylc-ping-fix

Cylc ping needs to contact suite if port file exists.
Merge pull request #190 from hjoliver/Issue-179-flexible-retry

Allow n*d in retry delays list. Addresses Issue 179.
Merge pull request #191 from hjoliver/Issue-117-task-state-on-restart

Removed automatic task state alteration on restart (Issue #117).
Documented the new restart behaviour in the User Guide.
Improved cylc restart help documentation.
Removed some obsolete import statements (no effect)
Removed an obsolete import statement (no effect)
Merge branch 'master' into gcylc-themes-by-menu

Conflicts:
	bin/cylc-gui
	lib/cylc/gui/SuiteControl.py
render partial project and proposal
Restore download links.
hidden_data in form_for
hidden_data in form_for
fixed font setting
synced with hermes (fixed curved elements)
comming soon
fix comming soon
coming soon
SOCL: Fix ICD

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/starpu/trunk@7434 176f6dd6-97d6-42f4-bd05-d3db9ad07c7a
fix module endwith #
add test
add new test case
add test data
update new test case
change version to 1.1.1
revert require id support #
change version to 1.1.2
rename
add new test case
fix globals var
del old test case
rename tests to test
update new test case
Change version to 1.1.3-dev
update Makefile
update test case
del old test
Fixed moves for Figures
Added serialization to a few of the models so that JSON output works
Merge branch 'master' of github.com:hungr-dev/dev
完成了“管理我的关注”
change PForDelta to be backward compatible to 3.0.1 bf13927e136470ad5425522014514913324b824e, changing in the compressed block: the int(b and expNum), the second int(blockSize), combining the expPos and expHighBits
Added proper feedback to default commands.
Made KillCommand set the player health to 0 to allow it to work in Creative. Fixes BUKKIT-2949
Remove unnecessary Overrides in Default commands.
Add aliases to TellCommand to bring us in line with Vanilla behaviour.
Update Bukkit for Minecraft 1.4.5 changes.
Merge branch 'master' of https://github.com/Bukkit/Bukkit into 1.4

Conflicts:
	pom.xml
fix spectator settings
o add include for off_t
o make oversize factor configurable.
데이터 소스 받기 완료 토스트 수정, 업로드 시 디스크 IO에 대한 스레드 제한 해제 추가
check arguments before closing system calls

I added conditional statements before executing the final system calls, free() and close(). Otherwise, executing system calls on invalid arguments may cause unexpected behavior
boston as the center!
Pass format => "openstack" explicitly
added default spamassassin connection info
Remove templates and languages from config
add vertical-align: text-top; to class firsttd so the date is aligned to the begining of themessage in case of multi-line message
Merge pull request #43 from prune998/patch-1

add vertical-align: text-top; to class firsttd to keep date on top
Updated readme, swap out \r for <br>
Merge branch 'master' of github.com:rashidkpc/Kibana
Add a line break for readability
Switched to UTF-8 safe base64 encoder
euscan: fix #435118 and #435120

Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
getting the proper header files to be public
FileUtils: split getPath method, to ease testing

Without an explicit getPath(String path, String separator) method,
there was no way to test the behavior in a platform-independent way.
FileUtils: tweak javadoc
FileUtils: add simple unit tests for getPath
添加fancyzoom插件
Changed print to log.
remove any support for non-statefile fakeroot comms
lxml insted xml.dom.minidom
kot link
Enabled dragging concepts from the detail pane (broader, narrower, 
related, etc...)
Fixed series of SPARQL-Queries (any-match from [] to ?_foo)
Some more drag'n'drop: Current concept (shown in the detail pane) can now
be dragged...
dopracowanie zarządzania konfiguracj�

dopracowanie zarządzania konfiguracją, alternatywna lista sędziów,
wysyłanie maili na podstawie konfiguracji, wyświetlanie lig na podstawie
ustawień z konfiguracji, poprawa wybierania gotowych do sędziowania
sędziów
added partial test for eco template
Added skip option for optimization and compilation mojos.
Added force option. Unless set to true, only files that have changed will be re-compiled.
added psvince to detect running processes during uninstall
read and write bootstrap.php as utf-8 content
removed loading report.png from web, added local file
removed attr duplication
added uninstallation
using psvince.dll for running daemon detection
added msgbox to stop daemons
added warning box to inform about project folder deletion
fixed typo on constant name (STATS_MEMORY_AVAILIABLE => STATS_MEMORY_AVAILABLE)
Move pivot table link to top
Added commenting class for frontend
Add torrent file handling
Move real tracker part into blueprint
Add optional sentry support
Adding backup config for vim
bacon feature
updated readme
[maven-release-plugin] prepare release funk-0.1.3
remove unneeded UFuncObject pointer fields
Edit profile now how default values. Change password page is no longer squished. Hard and Soft Deadline changed to Full and Partial Credit
Swapped constant names for HackRF VID and PID. Fortunately, I also had them backward in my call to libusb... Now the names are right!
updated date on silkscreen
silkscreen zone for writing
fixed missing GND on U18
Flip endian-ness on USB MAX2837 register read request.
Return of the hand-optimized assembly for SGPIO read and write interrupt.
Reset only the one SGPIO slice flag that is actually causing the interrupt.
Add a guard for stream data file read/write, to ensure fd is valid.
plot options, zone updates
updated PCB specs to match sunstone
Initial commit of libhackrf.
Merge branch 'master' of https://github.com/mossmann/hackrf
no dirty words here
Share stylesheet between web and chrome apps.
saco el combo pongo date range
short commit-ids work for linking back to github, so let's use those.
Update src/kernel.dasm16
move istandApp location
updated extension keywords according to eparker
added cef/arcsight extensions validator
changed codingfarm theme
Finalised summary translation
fix for JERSEY-1170, grizzly request/response injection support added

Change-Id: Ia9d44f4df3b45ac2438427b814a0d6fdacd697e1
Added support for multiple resources with same @Path value.

Multiple resources with the same value of the @Path annotation are now internally merged together into a single resource model.
Added unit tests.
Fixed also merging of the resource names.


Change-Id: I1a892ca3de87c51b1546f52407d4c4ac970ca25e
Signed-off-by: Marek Potociar <marek.potociar@oracle.com>
Merge "Added support for multiple resources with same @Path value."
Getting dangerously close to passing the cascading store/retrieve test. Only remaining problem is an aliased parent pointer (last assertion in the test).
update markdown docs
Added `fresh` dep
upgrade connect
Added another example to content-negotiation
add hogan.js template engine for express@3.0
add hogan.js template engine for express@3.0
Merge pull request #1176 from nullfirm/master

add hogan.js template engine for express@3.0
Changed: res.send() always checks freshness
Merge branch 'master' of github.com:visionmedia/express
Release 3.0.0beta3
Fixed `res.send()` freshness check, respect res.statusCode
misc
Added 2xx / 304 check to req.fresh
update fresh
GET / HEAD only for req.fresh
Update mkdirp
Added `.default()` support to `res.format()`
docs
Added `res.links(obj)`
Added `req.range(size)`
WELD-1237 Implement Annotation inheritance rules (CDI-132)
AnnotatedTypeObserversTest
Identify ObserverMethods properly (based on AnnotatedType id)
Fix TCK runner (supports AS7 master again)
WELD-1262 testcase
WELD-1276 BeanManager.createInjectionTarget() assumes an abstract class is a decorator
WELD-1216 - improve validation of decorators
- fix delegate type validation
- fix abstract decorator methods validation
- add delegate type validation for custom decorators
- add delegate injection point validation for custom decorators
WELD-1273 Validate that decorators of built-in beans are passivation capable dependencies
Simplify Decorator validation
Exclude TCK 1.0 from the default test run
WELD-1277 Missing maven dependency to org.jboss.classfilewriter
WELD-1173 weld-osgi-bundle source JAR does not contain any sources
Upgrade weld-parent to 21
Improving command line accessibility; allow dictionary and stopwords to be read from path.
fixed annoying floating point property editor bug where typing .0 would be changed to just 0 while you typed.
recreated wiki RViz User Guide in doc/index.rst so user guide can be versioned with the code
Added more detail to views panel description in user guide.
added stack.xml to make this a unary stack and updated user guide with a remark about the YAML config file format.
added rosbuild_make_distribution() to cmakelists as part of the unary-stack-ification
Merge branch 'groovy-devel' of github.com:ros-visualization/rviz
added src/python_bindings/sip/panel_dock_widget.sip
Revert "ready for testing"

This reverts commit e1f207a284c1dc76704448a8c084bc1cb2e7a629.
Revert "Revert "ready for testing""

This reverts commit 5254d6cb63ba5cf0974d2e3dcec7748bb6655b9a.
Revert "Revert "Revert "ready for testing"""

This reverts commit 3d4c0c3716499b371438c64cc6274ea4a5261f6c.
Revert "Revert "Revert "Revert "ready for testing""""

This reverts commit 8d48b67c6d129b0c5a4054490b130697a4b7d79e.
git commit -a -m "init geoserver";
Adding jquery js and css files
initial version control version
clarifying channel in the title
added another planetinfo
clarifying channel in the title
minor tweaks
Added support for primitive multiple repetitions
Implemented fix suggested by the oXygen support team to make the plugin
compatible with oXygen 14.
rearrange more templates to make some sense and isolate blog components with general app components
Returns serialized output on function's first call instead of memory output
Fixed bug in hashing when dict keys order was not preserved
Added test for dict hash fix
Forgot to remove previous fix for the hash function
Added same hash fix for Sets
Added doc for Set hash fix
COSMIT: comments and pep8
REL: 0.6.5

Update changelog and version number
Refactored some of the internals of the Space objects as preparation for NumPy arrays and new KNearestNeighbor implementation.
Modified  to  in README.
Readme: reword Github 'markup' to 'markdown'.
Readme: fences.
Add multi-element lookup and lookup indirection capabilities
using a more specific aws-log-bucket setting to identify a bucket used for logging.
Added reference for KML 2.1 best practises from OGC
Some tweaks to get it working for Perl
Fix param typo
dom-prof 0.2.1
Plugins: remove compatibility for old plugins without metadata
plugins: add extension_unregister entry point
facebook: update pyfb to last version
facebook: better OAuthException detection. Format code a bit
qt4ui: resize window in single window mode. Refs #1501
talk to text-processing
LG test header

Signed-off-by: Joshua Michaels <joshuaiz@me.com>
Use ~ to hold grunt at 0.3.9
Update build process
Remove page for combine project
Update sidebar links
Blog post about leaving mantisbt
Some style changes to give the show page's description more room instead of wasting the space under the logo.
Fix character position for dot notation warning
Fix character and evidence for nonew
Fix do not use {a} as constructor, and adds test
Fix radix character, adds test
Merge pull request #608 from goatslacker/char

Fix character positions.

This patch fixes character positions reported by JSHint
in its warnings. Useful for fixmyjs and other programs
that rely on such data.
last checkpoint, everything works including the JS stuff
Enyo2Contacts
No really, use all the bytes
User page contains a table showing all watched items. Also edited url submission so it redirects to same page and deals with errors correctly
adding PAUSE feature + nocolor option
fixed my minimum date stuff
Plus de presentation !
New comments specify RecordConverter conventions
Shows the currently selected date in the start date picker

Signed-off-by: John Lawson <john@jwlawson.co.uk>
Updating readme

Signed-off-by: John Lawson <john@jwlawson.co.uk>
Simplified parametric triangles loop a little, and added a glPush(Pop)ClientAttrib to the main object drawer.
Moved the buffer binding into data source code, got rid of the cloogy 'first' static variable in triangles artist.
Added the hdf5 reader as small function library.
poprawa przy edycji pytania - upload zdjęć
Failing Redland test for UTF8
Merge pull request #62 from kjetilk/master

Added (currently failing) test for UTF8 with Redland.
finishing teacher panel
Better seeding
not storing cproto
Fixed #42
Fixed #42
Updated LT1880 symbol to have pinnumbers and better looking graphics.
Cosmetic
Merge branch 'master' into simulate
created by and updated by working
[c] Replaced rake with make
replaced sbar back arrow glyph with png
Removed rails.vim autoload (already in bundle)
Changed gvimrc to use 9pt
Added debugging message for pid velocity
linked some of the C pid commands to the backend
refs #15075. Several new fixes in mobile gallery demo - Thanks Eric Durocher (IBM, CCLA). !strict.
refs #15075. Updated image. Thanks Eric Durocher (IBM, CCLA).
refs #14344. Link todoApp demo from github into demos directory. The demo code is not finalized but ready for a beta. Contributions from Eric Wang, Ed Chatelain, Christophe Jolif & Chris Mitchell. All IBM, CCLA.
change the dnd demo url per Dylan's suggestion
refs #14360. Get a bit more realistic stock demo.
refs #14360. Update demo README to reflect latest contributions.
remove useless/obselete demo files
Fix syntax errors.   But still, this file does not obey dojo coding style at all.  !strict
refs #14344. Add icon for todoApp.
refs #14344. Fixes for todoApp demo build (we need to exclude todoApp views from build for now).
Merge remote-tracking branch 'upstream/master'
update to latest SDL
SDL: fix changes from the newer hg SDL version, libSDL.a -> libSDL2.a
Add Box-Diagonal
Add normal to vertex for easier handling
merge camera
Fix pg template
update
Merge branch 'release/0.9.59' into develop
finish journal+entry
fix utf8 bug?
/newを追加。
add two more exercises
history

Conflicts:
	dunst.c
	dunstrc
Adding Doc Blocks Skeletons where missing, some notes
Add StackMob iOS SDK 1.0.1
Merge branch 'master' of github.com:CocoaPods/Specs
UIImage-Resize
[Update] GRMustache 5.4.3
Merge pull request #565 from kreeger/master

Adding v0.0.2 of JASidePanels (newer commit).
Added iTunesSearch 0.0.1
The summary should end with a dot
Added pod spec for CocoaLumberjack log formatter
Fixed DMLogFormatter pod spec
Merge pull request #569 from prabirshrestha/UIImage-Resize

UIImage-Resize
CocoaPods release 0.15.0
Merge branch 'master' of git://github.com/CocoaPods/Specs
removed compare's function, will work on it later
added google maps, working on it now
poprawiony js na galeriach; poprawiony CMS
changes to upload boxes
making the flash errors work
Simplifying the Product entity.
added carousel for popular products.
Hack to make push/pop work with firefox.
forum: Set must_revalidate cache on most forum pages
added now.js install for windows
update environment
change version as custom
Dropped bunches of map jid and map jid factory classes
Added jasmine testing support
add travis.yml
initialize variables
use character equality
parse stuff inside link
Added classes, broke configuration and mixins out into separate files
remove ununsed classes
appengine backends
add the DoxyFile
deal with the copy of the xml file when add /remove a robot in the project
Removed extent_client pointer because now RSM is going to talk to extent_server directly
Implemented part of inViewChange detection
Update action_mailer_basics.md to ruby 1.9 syntax. [ci skip]
use template0 option for creating activerecord test databases in postgres build_database task
Raise generic ParseError exception when ActionDispatch::ParamsParser fails parsing request params.
Fix ActionDispatch::ParamsParser::ParseError message for XML and JSON parsers.
Make ActionDispatch::ParamsParser::ParseError#original_exception return the original exception.
Delegate ActionDispatch::Http::UploadedFile#close to tempfile
Update CHANGELOG.md
Correct default charset/collation for mysql dbs
Style: remove hash noise
Revert "update ActionMailer::Base documentation [ci skip]"

This reverts commit f5654e78b248ecc90e8556366c927e1176c2428f.

Conflicts:
	actionmailer/lib/action_mailer/base.rb

Reason: @frodsan asked me to revert since this change is breaking the
documentation in the edge API site
Remove .rb from require sentences
Raise the same exception the code is handling
Revert "Fix find_in_batches with customized primary_key"

This reverts commit 761bc751d31c22e2c2fdae2b4cdd435b68b6d783.

This commit wasn't fixing any issue just using the same table for
different models with different primary keys.
start could be a string

Related to 761bc751d31c22e2c2fdae2b4cdd435b68b6d783 and
eb876c4d07130f15be2cac7be968cc393f959c62
Add debugger to mri:test section of the Gemfile
Use debugger gem if we are not Travis and Ruby < 2.0
Merge pull request #7726 from jcorcuera/master

Remove '.rb' from require sentences
Update asset test to match one in sprockets-rails
Merge pull request #7728 from guilleiguaran/fix-asset-test

Update asset test to match one in sprockets-rails
Fix test_find_in_batches_should_use_any_column_as_primary_key
Accept parameters in methods delegated to tempfile
use config.action_controller instead of ActionController::Base in example code for asset_tag_helper
Fix default cache store documentation.

It's actually the FileStore.

Fixes #8130.
Disabled the rest of the failing arrow tests, same reason as previous
M main.tex pdf
delete print
delete *.pyc
1. 界面基本完成
Merge branch 'I2' of git@github.com:liubida/bullx.git into I2
1. 加上猪头的黑图
1111
init
server基本完成，WEB页面要完善
忘了add
up
下班 up
Merge branch 'master' of https://github.com/liugehao/msgp
delete the html tail
more Py26 test fixes
Fix get intrinsic
Accept the Contributor Agreement.

as suggested by "Contributing Source Code and Documentation" document.
chapter 3 rewrite done, i think
Output warning logs for failure encoding preset phrases.
Deleted af few files
modified:   ODP_csv_magic.py => fixed to accomodate new LIMS format
	modified:   pmag.py => updated version number
	modified:   pmagplotlib.py => changed plotXY function for more flexibility
Design Document

First Revision.
Still a very simple,stupid prototype.Render added.
[net-p2p/retroshare] version bump to 0.5.4b

Based on the work from Gentoo bug 175599.
One modification is added Apache license for openpgpsdk.
Prefix was specified twice.
First stab and boost target and build script.
css cleanin
experimental hiding of graph initially
Add getTemplateParamFromXml() helper function
Merge branch 'master' of https://github.com/macbre/nodemw
Initial commit of skeleton Bracket App
Proyectos ABM
ABM Projects corregido
Merge remote-tracking branch 'origin/master'
get rid of Vector
get rid of Vector
Changes for sprint 1.
Fixed Black Cat with target opponent required
Made button non visible on helper component rather than disabled
for AI: made BoostTargetEffect negative effect for */-X spells
Apostle's Blessing
diverses corrections dans la doc du code
exemple avec francais
exemple sans polyglossia
attention à bien fermer sans polyglossia
No underline for italics please
unauthorized useres can't comment posts
redirect to shorter post url when you click the magnifying glass on the stream [ci skip]
working on api for documents and people
including named entities in paragraphs
moving rendering to client
backbonizing
remove hardcoding of expected pixel types in agg svg renderer
- avoid using -rdynamic on compilers different than gcc
add source tif for #1471 testcase
+ code: avoid exposing unsafe static methods in datasource_cache ( #1451)
+ python: remove redundent 'instance' method (mapnik.DatasourceCache)
+ python: reflect plugin_directories method
+ tests: update python usage

TODO: consider using similar approach in FontEngine etc..
TODO: consider returning reference from singleton::instance() to
      safeguard from accidental deleting a 'singleton' pointer
Now xcache implements IterableInterface
default options of styles search set to others styles
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #72 from marcello/master

Disabilitando configuração em ambiente de produção.
Generator para componentes do weby
Merge pull request #73 from leo-souza/master

Generator para componentes do weby
Ajustes no generator de componentes
Merge remote-tracking branch 'upstream/master'
Merge pull request #74 from nicolaslazartekaqui/master

Pesquisa Estilos
Componente campo de busca
Merge pull request #75 from leo-souza/master

Componente de busca
corrigindo padding do componente
Tentativa de melhorar a adaptação de componentes, simples mudança no css.
add some month operations
moved builder dependency from gemfile to .gemspec as a runtime_dependency
securité améliorée + fix #40
modification validator
Update
Merge branch 'master' of https://github.com/marvids/vimrc

Conflicts:
	.gvimrc
	.vimrc
patch views_pdf_template.php
create command-line options
Change starusture of console command; Modify PrepareKeysStart command;
set vetsion 0.2.2a in setup.py
dont preload video tags
store and serve html versions of posts
style tweaks
add blog post html
check in webview videos
Ignore [^a-zA-Z0-9 ] when searching.
go fmt.
o Set up favicon cross-browser compatible
o don't use unmaintained index-debug.vm for ITs by default
o Add IT for favicon usage
o enhance favicon IT
o add favicon to error and content browser pages
o add favicons to content and error pages
Merge remote-tracking branch 'upstream/master' into nxcm-4389-favicon

Conflicts:
* nexus/nexus-rest-api/src/main/resources/templates/index.vm: meta-tag for IE8 compat
o refactoring
Merge pull request #463 from sonatype/nxcm-4389-favicon

o [NXCM-4389] Set up favicon cross-browser compatible
o [NEXUS-5146] do not hide storage context menu for unpublished URL
Some cleanup on the rdoc generation and markups.
Renamed the gemfile to qpid-messaging.

Moved the gemspec information to a separate file from Rakefile.

Updated the examples and libraries to reflect this change.
Added github link txt file to project 1 directory
lactacions por mes
Update lanyrd-scraper, remove redundant Twitter handle filter
archive de l'opé du 06/09
Add a phony strategy which aim will be to set up new lots
Add javadoc-style comments, add javadoc pages to repo
Change blog link
Merge branch 'master' of github.com:meurio/meurio
Got minimizing squared away.

Remaining: Combine the objects into an FA class. This way the
minimizing routine can also minimize the accepting_states list
which, presently, lives outside the transition_table in the
global scope.
split settings from script
Support non int project ids
Correct tests and bump required Sentry for testing
Writeup edits.
Add URLs for each section
DEFAULT_SRC_CONFIGURE_PARAMS should be an array
Layout definition was wrong
Added a message when validation on post values fails.
adding link for video section slide
Final touches
Remove some of the Google colours usage.

Google colours are still used in some of the images.
Dropdown for city
Integrate jquery_backend into blackbox, since backends are not switchable
Cleaner test dir
SERVER-5357: Map/Reduce operation writes output data in primary node of replica set but not in secondary nodes
SERVER-5357: cleanup following review
Fix mongo/platform/cstdint.h for old compilers that we still support.
SERVER-3918 Include pdfile.h in matcher_covered.cpp, fixing osx release build.
use condition instead of hard loop for critical section
remove extraneous and ambiguous abs() call
only retrieve labels from current user
Possible fix for #723 - Removed the 2D only SpriteBatcher.cs and SpriteBatchItem.cs code
Merge remote-tracking branch 'upstream/develop3d' into develop3d
Fix a compile error for Windows
Updated SpriteBatchItem.cs to assign the Z value of the Position
Merge pull request #781 from dellis1972/develop3d

Fix for #723 (SpriteBatch 2D only drawing)
addded a3
correction on home page

home page width, not the same as browser width. start css afresh to do
some debugging
Remove E4X from main components (ad-hoc). Closes #104
Omit prefix "module."
Separate plugin module into plugin.js
query-replace: Use setSelectionRange()
Add "plugin" command to the shell for keyboard-friendly plugin management
Revert "spotify: Remove gst import from spotify.playback module"

This reverts commit 0459f037a4e51886ccfbbdb59e7b70cea60e5f03.
spotify: Remove gst import from spotify.playback module
Added lookup for artists, albums
Merge remote-tracking branch 'woutervanwijk/lookup' into feature/improved-lookup
spotify: Fix flake8 warnings in lookup method
spotify: Refactor lookup code, add playlist support
Update author list
docs: Update changelog
Merge branch 'develop' into feature/improved-lookup

Conflicts:
	docs/changes.rst
	mopidy/backends/spotify/library.py
spotify: Use SPOTIFY_TIMEOUT when waiting for objects to load
spotify: SpotifyTrack fails when both uri and track is provided
spotify: Refactor loading timeout logic
spotify: Block track lookups until we get data

This makes track lookup behave consistently with lookup of artists, albums and
playlists. I consider this "safe", since track lookup is only used for lookup
of single tracks by URI. If you're e.g. loading a playlist full of unloaded
tracks, you should still use SpotifyTrack to avoid blocking on track loading.
Merge branch 'develop' into feature/improved-lookup
Merge pull request #284 from jodal/feature/improved-lookup

Improved Spotify lookup by URI
initial commit
Merge branch 'master' of github.com:mosfab/parsys
Added tunnel to ramp metering game.
Fix the linux build by stubbing out FreeType handles that haven't been implemented yet. Add some glue to create ScaledFonts for Cairo backend on linux. Closes #207.
Fix partialSync code in example
Support sending empty commands (useful for the Sync command)
Add comments and clean up how versions are handled
removed css tests
MpaDecFilter: created CMixer class
fixed changelog section
tracing end() behaviour
Move result tests into xtest file junit suite
Compute type parameter erasure at runtime
Modified monster location to live display.[test purpose]
Fixed it_scroll_move(DIR_DOWN) in thumb mode for last line
Fixed issue #44
Added updated version of Clang scan-build. Will remove the old one soon.
Rename GlaurungAppDelegate
Forward declare classes in header. Remove logging messages.
Move Game to Models
Restructure folders
Specify allowed configuration in plist
Restored "old style" BasicTransformStimulus constructor in order to support existing third-party subclasses
Added LICENSE.txt
Upgraded to Narrative 0.1.2.  Narrative is now downloaded and compiled like other supporting libs.
Upgraded to libpng 1.2.49
Merge branch 'master' into expression_parser_improvements
Expression parser now recognizes integer range expressions (e.g. "1:3" is equivalent to "1,2,3").  Selection variables now support range expressions in the values list (resolves ticket #58).
Various build changes

* ServersideConduit is now included in the "Standard plugins" installer subpackage (instead of "Python tools")
* The MATLAB client window is no longer explicitly listed in build_installer; if present, it is included in the "Optional plugins" installer subpackage
* mworks.pth files are no longer installed under /Library/Python (major OS upgrades remove the contents of that directory, which suggests that we shouldn't be installing files there)
* The core plugin Xcode template is no longer installed by build_mworks or included in the installer package, since it doesn't work in Xcode 4
* uninstall_mworks now performs backup/uninstall/restore operations as root (unless disabled via the --no-sudo command line option)
* Development.xcconfig now unconditionally sets llvm-gcc-4.2 as the compiler (thereby requiring Xcode 4.2 or later)
* build_mworks now uses xcrun to invoke make
* mw_xcodebuild now uses xcrun to invoke (rather than just locate) xcodebuild
* Simplified build_supporting_libs a bit
log4cxx: Set optimization level to O2

propertiespatternconverter.cpp fails to compile when the optimization flag
is "-Os", which is the default.  Appending "-O2" to CXXFLAGS, which is a
similar optimization level, resolves the issue.

Fixes #12565.
Closes #12566.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
Don't use XQuartz for e.g. :libpng on 10.8.

XQuartz isn't added to the default library paths so if something is
linked against a Homebrew libpng then it doesn't work against the
XQuartz libpng. The CLT provides X11 on Lion so don't request users
install XQuartz if it isn't needed on Mountain Lion.

Fixes #14325.
openrtsp 2012.09.12

Closes #13215.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
mldonkey 3.1.3
ettercap 0.7.4.1

Also marking as fails with clang.

Fixes #14347.
Nginx 1.0.14 & devel 1.1.17

Includes important security fixes

Closes #10961.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
ruby: upstream patch for shared library reference to _environ

Hey, we can compile vim against Ruby 1.9 now!

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
libgphoto2 2.4.13

Closes #11199.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
sf add temp
js syn params foreach to callback
Update test07 with examples for OML instrumentation
refs #881
adds testbed.rb experiment for load, save, stat, tell
Merge branch 'master' of git.mytestbed.net:omf
Move common global opts check to GLI pre hook
Loading testbed exp.rb in EC v5 commands support
fix up one use of qsa, verify the length of the returned array when checking for empty.
added docs for casper remoteScripts option
big pig now can oink
-Wno-global-constructors no longer in Clang 4.x
Added error control to search results
Fixed offset for events on the grid
Merge branch 'master' of github.com:natos/WhatsOn
Commented line 267, it was breaking the grid
- Refactoring
- Added getSubtreeString(...) in Newick format for visualization
purposes
Completed the login functions, removed cruft
change prompt seperator char
Rid of many TODO's and got rid of some more unused functions
Address bytes to mac address erro checking added
Update distribution to reflect new server.
Array spec typo
Had List being used in functions that aren't returning a list, fixed.

Finished Client Functions for data.
Instructor and Company Class functions
* Changed: Default to Scala 2.9.2, ScalaTest 1.8, Scala Specs2 1.11,
           ScalaCheck 1.10.0.

* Changed: Scala artifact repository changed to
           http://oss.sonatype.org/content/repositories/releases

git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1363581 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'trunk' of git://github.com/apache/buildr into trunk
sky might fall
Ignore some stuff
pexe executables
Propagate only if asked for
Enable Indonesia translation
Added week 2 content
Added week 2 content
Added week 2 content
Fixed index.html
Modified stylesheet to prettify
Modified stylesheet to prettify
Modified stylesheet to prettify
finished changing from week 1
Merge branch 'master' of https://github.com/rioleo/CS147
payment: remove redundant createPayment call

It seems that we don't use the createPayment call by accountKey.
Let's get rid of it.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
Fix issue in OverdueCode where we miss the first transition
Implement new cancellation action (with policies) in overdue and created specific beatrix test to verify it
Chnage Entitlmenet code to also have a API where we can pass the ActionPolicy on cancellation -- similar to chnagePlan
修正bug

修正 Open.event.fire 调用自定义事件时 event 对象不存在的问题
修正 Open.event.remove 方法在ie6/7/8下type参数传递错误的问题

添加 Open.event.createEvent 方法备用
TP and FN flipped, correcting
Extended heuristic root cues
FIRST DAY AFTER EXAMS BONANZA COMMIT

moved device checker to device.js, added camera.js and a new canvas to
draw to, which draws from the original gameCanvas. Awesome new Hydrogen
Labs bot in Inkscape, needs work for in-game sharpness. RETINA, people!
MILESTONE: updated version to 0.0.6.0! New 2D graphics and Camera system!
Adding a tab.
fix mixin declaration
fix fuxked-up regexes.  and of course adding a webcam to computer needs
snd-usb-audio and needs to bump the pulseaudio device index.  of COURSE
Merge branch 'master' of github.com:noah/dotfiles
fonts conf
Fixed build_cube method that was pointing to a defunct method
Issue 882: Make aws-s3 provider respect PROPERTY_S3_VIRTUAL_HOST_BUCKETS.
Merge branch 'master' of github.com:novel/jclouds
Use new Inventory-Rake wrapper
Use correct name for Dependency#feature
Add a reminder to switch to a newer/better API.
add mappings to default ,;fFtT under <leader> key
refs NUCLOS-577

git-svn-id: https://svn.novabit.de/nov_nucleus/trunk@8473 33553225-e83a-40c5-8946-3093c540bf14
refs NUCLOS-583

git-svn-id: https://svn.novabit.de/nov_nucleus/trunk@8474 33553225-e83a-40c5-8946-3093c540bf14
NUCLOSINT-1532: Diverse GUI-Anpassungen (für BMW)

Je Entität wählbar, ob Öffnung als Detailmaske (wie bisher) oder als Overlay (dann "Details" im Steuerelement oben links nicht sichtbar)


git-svn-id: https://svn.novabit.de/nov_nucleus/trunk@8475 33553225-e83a-40c5-8946-3093c540bf14
NUCLOSINT-1532: Diverse GUI-Anpassungen (für BMW)

Farbhinterlegung von Zeilen


git-svn-id: https://svn.novabit.de/nov_nucleus/trunk@8476 33553225-e83a-40c5-8946-3093c540bf14
refs NUCLOS-587

git-svn-id: https://svn.novabit.de/nov_nucleus/trunk@8478 33553225-e83a-40c5-8946-3093c540bf14
refs NUCLOSINT-1590 / fix for RuleRepository.getInstance()

git-svn-id: https://svn.novabit.de/nov_nucleus/trunk@8481 33553225-e83a-40c5-8946-3093c540bf14
refs NUCLOSINT-1586

git-svn-id: https://svn.novabit.de/nov_nucleus/trunk@8483 33553225-e83a-40c5-8946-3093c540bf14
NUCLOSINT-1532: Diverse GUI-Anpassungen (für BMW)

Je Entität wählbar, ob Öffnung als Detailmaske (wie bisher) oder als Overlay (dann "Details" im Steuerelement oben links nicht sichtbar)


git-svn-id: https://svn.novabit.de/nov_nucleus/trunk@8486 33553225-e83a-40c5-8946-3093c540bf14
NUCLOSINT-1532: Diverse GUI-Anpassungen (für BMW)

Je Entität wählbar, ob Öffnung als Detailmaske (wie bisher) oder als Overlay (dann "Details" im Steuerelement oben links nicht sichtbar)
--> geändert in Systemparameter


git-svn-id: https://svn.novabit.de/nov_nucleus/trunk@8487 33553225-e83a-40c5-8946-3093c540bf14
refs 	NUCLOSINT-1282

git-svn-id: https://svn.novabit.de/nov_nucleus/trunk@8489 33553225-e83a-40c5-8946-3093c540bf14
Fixed race condition in modjar.sh

Signed-off-by: Thomas Pasch <thomas.pasch@gmx.de>

(cherry picked from commit de2ae42e83a54baec6b6944f320bcb60972edb23)

Signed-off-by: Thomas Pasch <thomas.pasch@gmx.de>

git-svn-id: https://svn.novabit.de/nov_nucleus/trunk@8490 33553225-e83a-40c5-8946-3093c540bf14
Bugfix Nuclet Instance Transfer

git-svn-id: https://svn.novabit.de/nov_nucleus/branches/prod/3.6@8890 33553225-e83a-40c5-8946-3093c540bf14
BMWFDM-131 - 206 Berechtigungsprüfung bei Auswahl von Datenpaketen

git-svn-id: https://svn.novabit.de/nov_nucleus/branches/prod/3.6@8893 33553225-e83a-40c5-8946-3093c540bf14
vzxcvzxc
filename for questions/exams is readable instead of a uuid
user priviledge.
some more work on CVWidgetMS

widget-design: sliders, buttons etc.
revert to match upstream
Made tests compile
Add test project to main sln
Make Route Handling Pass
Add compression dep for Spdy
Initial commit of SPDY bits
Change test attributes
Added Headers tests
Add cleanup for headers test
Add Window Update Frame Test
Added Version Packet Tests
add cleanup again
Data packet parsing needs to happen too
prepartory stuff for generation tests
Syn Stream generation Test
name fix
Test Syn Reply Generation
Test Rst Stream Generation
Test Settings Generation, with changes to Settings Frame
bracket fix
fix various bugs
Global clean of everything
Merge branch 'dev'
API docs update
Pages update
Windows binaries update
fixed cvFitLine
fixed cvFitLine
fixed FitLine and MorphologyEx
fixed dist files
fixes are added to the DNS handler for unhandled cases
bug fix
Merge branch 'devel'
Integrated keymon/gdash. Added some sample home configuration.
Added a way to match any templates you have defined back to the host
name. So if you have, say, a set of mysql graphs and you want to match
those against all database servers then you can use a regex for that.
See comments at the top of autodiscover-hosts.sh (includes a little
configuration as well).
Properly handled ignored tokens in the tokenizer class (whitespace, comments, etc).
Added jackanalyser problem which passes all tests for the ExpressionlessSquare examples (not yet for the others!)
twitter and wordpress badge
swap index2.html and index.html
- workaround a grub2-mkconfig bug which happens if a ' sign is
  used as menuentry title in /etc/default/grub. if called with
  the option -o grub2-mkconfig complains even if the shell
  quoting is perfectly fine. Strange enough it works nicely
  if called as grub2-mkconfig > some-file. As this is only a
  small and maintainable workaround I applied it
- v5.03.60 released
- added support for reading /etc/kiwi/repoalias file in
  KIWIURL.pm. The repoalias definition can be used to
  mirror a repo path to another location (bnc #788536)
- fixed use of uninitialized values in the code now reported
  due to the use of warnings at runtime
- fixed nic interface runtime check, the value '0' is valid
  for the index of a VMware interface definition, thus it's
  wrong to do a true/false check here.
Added hashCode and equals methods to metamodel classes
disabling basic test
updating geoexplorer submodule to point to geoexplorer branch disabling closure compiler
updating geoserver-exts to pull in oracle fix, fixes #SUITE-611
Performance tuning - precomputing Type of a Cmd at parsing.
Using pointers as function arguments in some places. Barely useful.
Performance enchantment: the symbol table is now map[uint]interface{} instead of map[string]interface{}.
test

Signed-off-by: opmetic <opmetic@gmail.com>
Merge branch 'master' of github.com:opmetic/xxgan

Conflicts:
	appsuite/test.txt