labofsahil/github-event-dataset-2012 huggingface dataset:
Bug pour output des fonctions vsemi-corrige
Merge branch 'master' of github.com:01mf02/lea
Completed 'RemoteObjectParser::parseJString' method, moved index GET filter to 'Replyer' class, added an Object processing level in RemRep and removed std::string uri argument from filters (now all RequestInfos are self contained). The 'RemRep' class was cleaned up a bit and '-g' was set in the Makefile.
SQL: change alias geometry -- was ambiguous
Added rendering stats, surface, etc.
Updated loggedin page to use messagebox.
New template for loggedin page when warnings are detected.
User account activation checking added as a post_auth operation.
User creation implemented.
Self-registration working up to activation.
Need two activation methods: one for users by id, another by actcode.
User activation and login operational.
Improved messagebox appearance, and started on 'Continue' buttons.
More continue buttons added, streamlining of activation process.
Initial commit
Added screenshot and logo.
Added screenshot and logo.
Reinit
Updated logo and screenshot.
Starting on styles.
Starting on styles.
Starting on styles.
Override header.
Added navbar files.
Added navbar files.
Added navbar files.
Fixing nav bar.
Added footer background.
Added footer background.
Footer styles
Working on OSU Logo.
Branding
Missing semi
Banners
list/help
list/help
added siv option to bpmv.find(); rid of legacy doc crap
Refactoring of OptFunction class
Issue #2 : DetailViewMethodsの作成
add save buttons to top of admin pages
arbol ya esta
Rename task description list to task collection

Changed the link relation
added some demo code that shows what kind of issues are detected, e.g., by the FI_USELESS checker
use KrbLocalUserMapping to strip @REALM in REMOTE_USER
Correção falha ao mudar a senha
finally v-a
fix?
no static
Merge branch 'owl' into kk
populate fixed
basic account_data layout added
quick field label fix for entering
separate block for kotiks
bolds removed && parts remarked
account_data WIP
Merge branch 'kk' into owl

Conflicts:
	front/front/static/css/core.css
related_name
registration date added
account_data WIP
edited schema, changed length-type, added elevation to point-type
還是一樣有點亂XD
Ajout des fonctions js
Cleaned up ProbeToolTipWindow code.
refactoring winding loop
new thingses
removed bullets and underline of nav
added columns, removed anchor underline, and cta button
added sprite
optimized 4 pictures again, added better comments, and image styling
N2NP: relay gives source IP to node

Signed-off-by: Nicolas Iooss <nicolas.iooss@polytechnique.org>
Added volume service requests
fix on module name
Merge pull request #41 from pmdeazeta/volume_service

Volume service
removed forgotten debugger
[openstack|compute] Added requests for quota
Merge pull request #42 from pmdeazeta/pry_remove

Pry remove
[openstack|identity] Fix status code expectation

Signed-off-by: Nelvin Driz <nelvindriz@live.com>
Merge pull request #43 from agarcia1337/quota_requests

Quota requests
Added request for boot_from_snapshot.
Merge pull request #44 from adillera/local_development_branch

Added request for boot_from_snapshot.
Added id attribute to the keypair.
Merge pull request #45 from adillera/local_development_branch

Added id attribute to the keypair.
Support anime query and drop anime fields from file data request
Support anime query and drop anime fields from file data request
Add check for information leak
added the south migration file for english addition to staff object
fixed spell constructors and timer initiations and started fixing HudView
heroku problem
relacje uzytkownikow
interfejs do relacji
strony do znajomch
niedzialajace renderowanie formy ajaxem
smiga
Set _bundle_dest_dir as local variable
Modifications Benchmark
Added 3x3 and 4x4 matrix classes with basic transformations.
Added parameters to window events.
Preview painting now only updates when the tiles position changes
Working on making painting faster...
Updated Circuit view to show link between Circuit & CO Person
correct i=n recursive case

Previous version ran off the end of various vectors
check zohar_linear_solve precondition
I'm an idiot.  =/= /home/rixius...
style adjustments to accommodate windows-rendered text
scotts first commit
Looking better.  More progress made, but still unfortunately unusable for daily driving.
removed doublepen2/3
Underworld set: New hatch and exit
new mailer
merge
reset password from
password reset
Merge pull request #64 from will123195/master

password reset
wrong delayed jobs code
ruby -v
manual entry on new gear item form
disabled price alerts
manual entry attr accessible
no method error
no method error 2
various meta info changes + wp_meta table
add TODO list
add plpgsql function searchNews
Merge branch 'hotfixes' into develop
add search news, uncomplate
Merge branch 'feature' into develop
Merge branch 'develop'
mobile views and route
Fix dumb layering bug.
packed/little_endian: typedefs fixed
Bug fix in seqset for saturated nodes
carga inicial archivos base
deleted polling
REVIEW: Packaged external jars into current jar; reorganized file tree.

Change-Id: I8c66bcbcf738a55d26b222b5a13f3516a2600f99
Initial team registration

Change-Id: I69b45fa53cfb8f2b238884510ebada88ecdfe8e7
Merge branch 'master' of github.com:afchin/cs3
Add cache control headers for redirects.
Capture updateToks signature
Begin working on new I/O system, based around mowgli.vio and mowgli.eventloop
Revert "temp fix." Fuck yea C11.

This reverts commit 46baccba3194a8d6c28962c041ce9f503d3c16a6.
Update snapshot example
Start splitting patches for desktop gUM
removing twitter boostrap
[klinik]
vimrc - use listchars to display trailing whitespace etc.
added the search field in the booklist
adding accordion to book_lists.
fix #9
vc++ test
Refactor to extract TasksController.
rename to ada
update readme
Step #1: try stereo output in pulseaudio
Blog fix and over 21
updated parameter descriptions
BEAM-1402
node_clone added
add suport for json
Revert "bz18863: Don't create display until we really need to show it."

This reverts commit d8bc1d5b37959f80b2f503d2bafe11842376e7d9.  It's an efficiency
speedup, but it's causing the widths of views to be calculated incorrectly.
use assertClose for the duration in MovieData tests
moviedata test updates

* split DRM test into one for OSX and one for GTK/Linux
* add a test for videos
Merge pull request #335 from paulswartz/bz18985

bz18985. fix failing MovieData tests on OS X
Merge pull request #334 from paulswartz/bz19019

Revert "bz18863: Don't create display until we really need to show it."
bz19020. localize "Close" button on GTK
add a couple new phones

* HTC Sensation
* HTC EVO 3D
bz19071: better debugging to figure out this problem.

This change definitely won't fix the bug, but it does help improve logging in
2 ways:
  - Added extra info when we call failed_soft()
  - Fix for stringify(), which is called by crashreporter so that it doesn't
    escape newlines.  Otherwise reading the log reports is pretty miserable.

I've tested this code by provoking the crash and it seems okay.
Merge pull request #337 from paulswartz/devices-20120423

add a couple new phones
Merge pull request #339 from bendk/debug19071

bz19071: better debugging to figure out this problem.
Merge pull request #336 from paulswartz/bz19020

bz19020. localize "Close" button on GTK
Corrected Tu's name and added the more precise annotation messages
begin implementing Goz::Service
Update CMake to enable normal Xcode workflows

Similar to the existing CMake Visual Studio IDE support, allow CMake to
generate Xcode project files in mruby's root directory. This enables
workflows normally expected by Xcode IDE users.
Update in-source build error message
use mrb_malloc instead of malloc
Add Test Case for issue #210
Add Test Case for issue #211
ensure str_modify is called at the beginning of modifying methods
Use "if" instead "switch".
Merge pull request #224 from monaka/pr-use-if-instead-of-switch

Use "if" instead "switch".
Merge pull request #217 from takahashim/fix-use-mrb_malloc

use mrb_malloc instead of malloc
Merge pull request #218 from thecodeshop/cmake-xcode

enhance CMake support for Xcode native builds
Merge pull request #220 from bovi/test-for-issue210

Add Test Case for issue #210
Merge pull request #221 from bovi/test-for-issue211

Add Test Case for issue #211
fixed const_get && const_missing issue
Could you add me to AUTHORS?
'mrb_sym' used as 'uint32_t'. it's broken portability; based on the work from @crimsonwoods; close #216
Merge branch 'master' of github.com:mruby/mruby
Merge pull request #226 from MobiRuby/author

Could you add me to AUTHORS?
Merge pull request #225 from MobiRuby/fixed_const_missing

fixed const_get && const_missing issue
std: Camel case net modules
syntax: Replace token::DOLLAR_PAREN, DOLLAR_NUM with just DOLLAR

Figure the rest out in the parser
Fix broken determination of external method type param count

Closes #2185
Fix long line in test
pretty printer: Properly print explicity types for block params
Misc code cleanups using list::each for list iteration
Simplify representation of ast::path
Move map iface over to more `for`-friendly iteration methods
Emit a more useful error when using an unsuitable function for a loop

Closes #2255
Guard against infinitely expanding generic/inline functions

Closes #2220

Test case disabled until a memory-leak issue is resolved.
rewrite the resolution infrastructure; but it's still grody
Various regions fixes.
remove outdated comment
remove dead code
moderate comment, remove some dead regions code
Register snapshots.
Discuss (*) patterns in reference documentation
Mention lazy evaluation of log arguments in tutorial
Fix bug with * patterns in trans_alt

    enter_opt was handling the (*) case wrong and causing a bounds check
    failure. Fixed it (the test case is one of the extracted ones from
    the reference manual)
rustc: Use LLVM named structs for enum types
BATTLE added
dvwvw
Revert "update scope"

This reverts commit b47f93173d566a7363a60ec253a096d232798e42.
Strip executable.
Jekyll will output to _tmp for site generation, and git will ignore that directory
Bump to 1.0.0.rc1.
add processDone flag to avoid timer racing
update tp4
estilisando label fonte e categoria em uma noticia
improved discovery to not pass base src path to exclude computation; removed unneeded trees config from all standard profiles; fixes #15484; !strict; thanks blowery
remove meaningless return statement, fixes #15753 !strict
make Declaration support <script type="dojo/aspect">, fixes #15808 !strict
refs #15684, AMD and modern Dojo overhaul of dojox/gantt, !strict
fix assemblyinfo, set version to 0.3
Dynamo DB classes 
Get impl
ddb
Merge pull request #7 from dret/master

some work on incorporating XML and the instance link
should disambiguation
rewrap
add instance to schema
fix schema entity
created XSD copy for -02
Made services' outgoing FTP connections work again
Added the service invoker
Refactored the HTTP/SOAP handling code into separate modules
Refactored the HTTP/SOAP handling code into separate modules (adding them now)
Added missing rule in makefile
Updated language files
Forcing new prefixes to be 32-bit
Language file update
Ignoring more files
drop the "native" npm argument; compile native extensions if possible
bump
Actualizaciones criticas
incorporate Color, Html shell classes from Thor
Shell is now set in Implicit, Generate configure_command callback
based on the :color option (defined in CommonOptions).

Note other built-in commands Help, List, Setup set the shell
manually.

Remove Ing.shell_class and all references to it.
version bump; update todo
Smarter fix
Tracing starting from ball boundary failed to hit ball second time. Fixed and tested
installation instructions
build install in docs
following pull request comments
updated URLs
Merge pull request #33 from marqh/installInstructions

installation instructions
Changes to setup.py, plus the addition of a MANIFEST.in file, to copy/install appropriate files during installation and building of source distributions.
Removal of symlinks (move of content to follow in subsequent commit).
Moving of tests and results to lib/iris/tests and lib/iris/tests/results
Removal of outdated DEPENDENCIES.txt and updates to INSTALL.
Log: added fatal error handling and uncaught exception handler
use sprintf for rounding for ruby 1.8.x compat
require thread module for Mutex - ruby 1.8.x compat
require rubygems - ruby 1.8.x compat
set defaults in cmdline class
implement workaround for getch blocking in non-blocking mode bug in 1.8 - ruby 1.8.x compat
add shell script to compile core-js
Merge pull request #69 from d-snp/cat

add shell script to compile core-js
DOC-2305 Fix some small errors of Chapter 2 - Configuration
Update srv/resources/site-config/models/deliverCar.js

edited
devel.cfg for db-layer/postgresql-simple
use sinatra server and remove old code
more goodness

removed mac DS_Store crap
fixed all sorts
updated performance to track sub functions in a class
add EXCLUDE and INCLUDE tags to class for profiling
add util class to detect type
Added Pycomplexity and PyDoc. Updated Readme. Added vimrc.
[static] move to a span8 for the install page
No need for status var
Env not needed
fixup! Env not needed
Added idea for SSE2 implementation of findMSB
fix last known regressions
Added a nextValidId field.
api.py is no longer executable
able to move from kitchen to pantry
Update library/Zend/Db/Adapter/Driver/Mysqli/Connection.php

Using setResource method cause an exception Catchable fatal error: Argument 1 passed to Zend\Db\Adapter\Driver\Mysqli\Connection::setResource() must be an instance of Zend\Db\Adapter\Driver\Mysqli\Mysqli, instance of mysqli given

Because the class is under a namespace, the type-hinting expects it to be under end\Db\Adapter\Driver\Mysqli\
Don't add separator if not prefixing columns

When not prefixing columns with the table name
don't add the platform's identifier separator.

Fixes #2599
Correctly hydrate when using base fieldset
Add test
[#2716] Fix form image captcha test

- tearDown() was referencing an invalid property, leading to errors.
Merge branch 'hotfix/2716'

Close #2716
Merge branch 'hotfix/issue-2599' of git://github.com/robertbasic/zf2 into robertbasic-hotfix/issue-2599
Zend\Db\Sql\SelectTest
* Moved test for columns without prefixing into the data provider
Merge branch 'patch-1' of git://github.com/coudvanrm/zf2 into coudvanrm-patch-1
Zend\Db\Adapter\Driver\Mysqli
* Fixed casing of internal class names for mysqli for consistency
=Be verbose
Split R-package in seperate jar binary and functional package
Minor fixes

* Fix circular dependency between gemtc.jar and gemtc
* Fix typos
* Enhance documentation of write.mtc.network
Merge pull request #47 from joelkuiper/develop

Split R-package in seperate jar binary and functional package
Simplify and improve buffery stuff

Move responsibility to irc module, away from message.
Put extra bytes in beginning, and fix offset bugs.
Internal pll readers to us timings part 2


git-svn-id: http://streamboard.gmc.to/svn/oscam/trunk@7011 4b0bc96b-bc66-0410-9d44-ebda105a78c1
oscam-reader: Fix possible crash when ecm->parent is NULL.

The crash was reported by StEVE^qSR @ streamboard and
after applying the patch, the crash is gone.

git-svn-id: http://streamboard.gmc.to/svn/oscam/trunk@7012 4b0bc96b-bc66-0410-9d44-ebda105a78c1
revert pselect -> not working on ppc


git-svn-id: http://streamboard.gmc.to/svn/oscam/trunk@7013 4b0bc96b-bc66-0410-9d44-ebda105a78c1
csctapi: Prevent usage of possibly uninitialized variables.

The compiler is right that some of the checks might not pass
and the result is use of these variables without being initialized.
  csctapi/icc_async.c: In function 'InitCard':
  csctapi/icc_async.c:1148:4: warning: 'WWT' may be used uninitialized in this function [-Wmaybe-uninitialized]
  csctapi/icc_async.c:1113:35: warning: 'CGT' may be used uninitialized in this function [-Wmaybe-uninitialized]
  csctapi/icc_async.c:1131:3: warning: 'EGT' may be used uninitialized in this function [-Wmaybe-uninitialized]

git-svn-id: http://streamboard.gmc.to/svn/oscam/trunk@7014 4b0bc96b-bc66-0410-9d44-ebda105a78c1
Dynamic service chaining. 'iris check' command.

Endpoints are now configured within each service by specifying a set of criteria (e.g., a configured endpoint with 'fastbit' capability that handles the '/gwas' path).
Using 'nodeunit' for unit-testing service configuration logic.
Added an 'iris check' command to run nodeunit. Should be used to confirm installation.
versão A
Change cond_var attributes in channel creation

* Change default clock to CLOCK_MONOTONIC.  Previous use of
  CLOCK_REALTIME could cause bad behavior during leap seconds or
  whenever the clock is reset, e.g.  by NTP.  CLOCK_MONOTONIC cannot
  be reset, making it more suitable for real-time behavior.  An
  alternate clock may also be specified in the ach_create_attr.

* Do not make cond_var process shared for anonymous (heap-allocated)
  channels.
Cleanup benchmark code

* Prefault stack
* Subprocesses exit on their own
* Explicit help command line flag
* Remove redundant calibrate()
Reserve space in structs for future compatibility
Remove deprecated interfaces and unused code
Create a real NEWS file
Rename ach-bench to achbench and include in deb

* Consistent with achpipe and achlog
* Include with ach-utils package
Update version to 1.0.0
Check for existence of autoconf archive macros

* Only enable compiler warnings and doxygen output if the relevant
  macros are defined
* AX_CHECK_COMPILER_FLAGS was renamed to AX_CHECK_COMPILE_FLAG.  Test
  for both versions.
Do not link everything against libm, just ach-example
Fix cmake build

* Disable broken compiler flags
* Give ach binary the proper name
* Dynamically link ach binary against libach
* Set version for libach
Gitignore versioned libraries
Create manpages using help2man
Remove .la and .a files from debian library package
Minor tweak for deb packaging

* Use dh_python2
* Clean manpages with maintainer-clean target
Add index link to manual
move the tracing from linearize() to QPTreeWriter
move the creation of activation statements into QPTreeWriter
unsavedEditors refactoring missed a few
move tracequeries out of tree writer
focus on object properties
refactor LinearizeTransformer to extract InsertingTransformer.js
Rework ValueChangeQueryTransformer with new base classes
Added Monaco font, and my PhpStorm settings.
Changed the way SSL parameters for MySQL are used to allow simple SSL connections (ticket #34)
Added Malaysian localization (kindly provided by MasterScript)
with player crash
player crash
Added more functions

- can now alter table in functions
Added times function
Can now define functions.
Added CompareWith for comparisons between all VTypes
Now have enough language to create a boot file
fix strict mode error
convert to OpenOffice
ignore invalid model index at setCurrentFrameIndex
removed unused addBoneKeyframesAtCurrentIndex
t10
deleted t10
refactored the position
libconnect: lib/packet: refactoring dump; broken build on NT
libconnect: lib/: refactoring dump for NT support; adding sample for dump IP on NT
libconnect: lib/: playing with autodetection packet type engine for dump
libconnect: lib/: adding proto autodetection, basic support callback for dump
Added UserAttachmentController

attachments_controller.rb:
  - new CRUD/REST

layout_helper.rb:
  - new function humanized_filesize(bytes)

application_file.rb:
  - process styles only if image-file

attachment.rb:
  - adapted to use with controller

signed_in_menu.haml:
  - Add link to 'Your files …'

routes.rb:
  - Add ressource Attachment in root and nested in :user
  - /attachments and /user/:user_id/attachments

attachment_spec:
  - add file_name-delegate

attachments_controller_spec:
  - new specs for new controller

application_helper_spec:
  - test the new function
277969-36917877 Implement support-discussion for components
Merge branch 'master' of github.com:iboard/wat
auto upload Sat Dec 15 19:34:53 PST 2012
auto upload Thu Dec 13 09:12:49 PST 2012
Merge branch 'master' of github.com:idano/home
auto upload Thu Dec 20 05:45:51 PST 2012
auto upload Tue Dec 11 11:17:49 PST 2012
auto upload Tue Dec 18 14:19:12 PST 2012
Updated base url at user autocomplete path to use an absolute path
Adding a dirt dog
Adds pop and isless to sets
Named gensyms in macro hygiene.

The print name of the gensyms which are implicitly generated in macro
expansions, now contain the name of the symbol being replaced.
Not storing named gensyms in *gensyms*
Visual separation of multiple hygienification in gensym name

Sometimes an already automatically gensymmed symbol is replaced by
another gensym, by the higiene system. The resulting gensym name was
rather confusing. This is an attempt to make it less confusing.
warning for overwriting a method from a different module. close #1737
Merge branch 'master' of github.com:JuliaLang/julia
Improved ctags file
Merge pull request #1738 from binarybana/master

Add pop and isless to sets
faster set comparisons
update compile hints
doc: update to new ccall convention.
Merge pull request #1734 from jacg/named-hygiene

Named gensyms in macro hygiene.
Merge pull request #1739 from ihnorton/master

doc: update to new ccall convention #1720
small edit to ccall doc
use format var#num for named gensyms
fix #1575
more ccall doc
fix crash/llvm assert fail when un-qualified function name is not found
fix #1740
fix ResourceModel forcing on update_fields
also added repr code.
add github gist example
Button hinzugefügen
added title attributes to input form fields; removed divs
Strucjure has moved to its own repo
change directory oaza -> Oaza (by namespace), add autoload class to bootstrap test file
Fixed bug in Firefox < 10 where the question display text was showing up as undefined
Merge pull request #23 from orthogonal/master

Fixed Firefox <= 10 bug
Add a "Counter" to the UI.

It's like chartbeat for NSQ
new function for create extend
project list upgraded
removed versioning Run Script because it was causing conflicts and unnecessary touching of info plist
index
Merge branch 'master' of https://github.com/jniles/web
fixed txtOnly
Added HTML 5 specification as another dataset for HtmlEmitterBenchmark.
Build with MRI 1.8.7 and 1.9.3 on Travis
Merge branch 'travis'
use javascript-indent for better indentation
Build fixes for windows

Add entries to OBJS and SRCS as well as STLIBOBJS.

Use KRB5_CALLCONV at function definition as well as declaration.

Declare missing variable in _WIN32-conditional code.

ticket: 7479 (new)
tags: pullup
target_version: 1.11
Leave 'OK' button visible in Leash AboutBox

The AboutBox dialog as specified in the resource file is larger than
the one we display; the dialog init routine marks several things as
non-visible, moves the 'OK' button up to where the now-invisible items
were, and shrinks the dialog's bounding rectangle.

However, the edit boxes containing copyright and version information
seem to always present as being on top of the 'OK' button, and their
background causes the button to appear almost invisible with the current
repositioning.

To keep the 'OK' button visible, reduce the amount that it is moved
(and the amount the dialog is shrunk) so that the button does not overlap
with the edit box.

ticket: 7443
tags: pullup
target_version: 1.10.4
Rewrap the Leash ribbon conf file

A big pile of XML on one line is not very readable.
Use 'xmllint --format' to make things more sane.

ticket: 7478 (new)
queue: kfw
tags: pullup
target_version: 1.10.4
Use unique shortcuts for leash options

Both "Renewable Until" and "Automatic Ticket Renewal" were attempting
to use 'R' as their access key shortcut.  Microsoft's UI recommendations
seem to say that access keys should be easy to locate when searching
through the menu, and thus using the first letter of the first or
second word is advisable.  As such, use 'T' for "Automatic Ticket Renewal"
and eliminate the conflict.

ticket: 7441
tags: pullup
target_version: 1.10.4
KfW shortcuts for make default, change password

Accessibility rules require that keyboard shortcuts are available
for all functionality.  Add shortcuts for "Make Default" and
"Change Password", displaying them in the MIT Kerberos ribbon 'home' tab.
The ACCELERATOR entry in Leash.rc is what actually enables them, though.

ticket: 7442
tags: pullup
target_version: 1.10.4
KfW: Access keys for the ribbon interface

Improve accessibility by actually enabling access keys for ribbon
elements (tap alt and follow the onscreen hints for keys to press),
instead of just underlining a letter in the name of each element.

The Ribbon XML Reference seems to indicate that these elements should
be "keytip" elements, but MSVS creates "keys" elements, which seem
to work okay.

ticket: 7441
tags: pullup
target_version: 1.10.4
Fixed NTriples serialization. Fixed a couple of bugs in the output triples.
modal do dodawania zadania, bez podpietych service'ow
link do dodawania taska

dodatkowy link do dodawania zadania

wpiety zle zachowujacy sie modal + datepicker

poprawiony modal do dodawania taska
layout sciagniety z lp + obliczenie liczby dni do slubu
Get rid of event stuff

Signed-off-by: Karel Tuma <karel.tuma@gmail.com>
Solved AOJ 2208
Added a Sage prototype of the C++ code to test Stanley's conjecture.

It's fairly robust for the lack of resources available on the VM I've been running it on. Also, it's fairly unoptimized. Seems like a promising first step, though.
fix typo
Merge branch 'master' of git://github.com/kento/SC12
Adding a formatting interface.
Removing unused $attributes property.

The original design did not rely upon ArrayObject to manage access to attributes.
Removed dependency on ClassLoader.
ADD: Meld#before now returns a value if not undefined
SWITCHYARD-1101 - Adding HTTP component and hiding Clojure
SWITCHYARD-1108 use updated names to resolve configure mojo properties
a few more CGI tests
mention which methods are meant to be overloaded in subclasses
switched to ami with instance store, imporoved test timing
исправления
Merge branch 'master' of github.com:laz2/ppvis

Conflicts:
	lab11/lab11.tex
Change architecture..little
ignore more
restructure docs building
updated dev guide
OPening hours
June 25 postings.
Add Process#enable and Process#disable
Task G Playtime 3 fix; deletion of unused files
清理没用的插件
Put SVG axis helper ticks in their own g element. This makes it easier to select first/last ticks using CSS.
add 404 5
Don't use deprecated api
修改complete-dict到after目录
Improve movetip by pushing more to the body. May want
to remove the parent method entirely
read record and new user center style
made the 'listen' gem optional

On my Mac's it wouldn't always install on first-try so I figured this
way you can still use it without monitoring - and if you want it try to
install listen yourself.
tweaks session writing
Add client support.
Fake Entrypoint Detection PE32+
Fake Entrypoint Detection PE32+
Merge pull request #9 from barongello/master

Fake Entry Point Detection PE32+
MIFOS-5731: apply patch from Hugo Technologies
fixed problem with integration tests in HUGO TECHNOLOGIES patch
updated data sets
apply hugo technologies patch
Fixed acceptance tests
MIFOS-5797: fixed problem to import loan account when LSIM is enabled
Merge branch 'hudsonBuild-MIFOS-5731_2' into j-maint
Revert "fucked"

This reverts commit 64b80902e7e64d8b7cae824f84ada8885d5a2a4c.
Revert "Started working on the homepage"

This reverts commit 63a0f63ba0525a920e79103ece487c735b9bbecb.
back
c21
Merge branch 'master' of https://github.com/mikelik/py
transformer minor fixes
Specify compiler options for building lupo library
Add a new spec for the diary parser
Remove logics to escape special chars, they are XmlHtml's tasks
Modify syntax: Skip lines starting with CRLF, CRLF is sometimes included
git-track-repo.txt: 增加推送到远程追踪分支的方法

使用这种方法，当我们在一个分支中运行推送命令

$ git push

Git 将会把当前的分支推送到 git pull 拉取的分支中。也就是
branch.<name>.merge 配置的分支中。

参考资料：

[1] git-config(1) 中的 branch.<name>.merge 和 push.default
autoComplete
suggestChordName #3
implemented finder functions for using filebuffers & mcstring
adding hello world
Merge branch 'master' of git@git01.phpfog.com:ehs.phpfogapp.com

Conflicts:
	index.php
sept 12, 2012
show full name of missing ruby in set, fix #1271
Cause MiPlan#latest_relevant_mi_attempt to take Chimeras obtained into account
Chimeras obtained in impc3/komp23 report
IMPC3/KOMP23 reports accumulate chimera status in mi
Add chimeras to month by month activity reports
TestDummy now passes on arbitrary hash values to factory
Fix populated_phenotype_attempt factory
Fix komp23 report test so can add extra columns easily
Fix summary_month_by_month_activity_komp2_test.rb
Merge branch 'mi_chimeras' into back_fill_status_stamps_4
Move jammit to development bundle
Make choose_es_cell_from_list in test_helper.rb not use sleeps
Try to uncache some DB access in an integration test to make it less brittle
Remove some more sleep statements from tests
Remove more sleeps from integration tests
Name an integration test properly
Try to fix intermittent failing tests in test/integration/phenotype_attempt/edit_in_form_integration_test.rb
Try to make integration more robust - test/integration/phenotype_attempt/edit_in_form_integration_test.rb
Merge branch 'ayq' into mgi_id_fix
removed legacy psadwatchd.conf file references
added childcare subsidy rules
2012-11-30 04:00:18.065543
Ignore
ignore
Config
Gitignore
Ignore
Resolving conflicts
Split Match view to be Season-specific
Add reciprocal links between Seasons and Matches
Games index view is now Season-specific
Started splitting off the Players (and results)
by Season.

This is going to be the hardest of all of them.
Still not sure of my final strategy.
Players tests now pass. 

All methods modified to accept a Season. 
By default, not passing a season always defaults
to the last one? 
Controllers now understand Seasons. All tests
pass.
Merge pull request #1 from ngzax/split-seasons

Split seasons
gitignore
helper.h
Merge pull request #1 from flybird8/fly

Fly
Merge branch 'master' into nighca
temp
newtemp lookup enter
string.h
Merge pull request #2 from nighca/fly

Fly
temp
Merge branch 'master' into nighca
temp save
It works on the server! Serverscript now look at normal www-folders data/scoreboard.json for updates. The Arrays equality-cheking now works as expected. Updates that removes attributes are not considered due to that posts without data isnt sent, so a update that removes data is like it isnt changed at all.
A working collection and collection view has been added.
changes in readme by b1
Fixed immediate notification
Fixes to the setup file.
Fixes to the installer.
Few tweaks to the new theme.
Added scheme code for arrange-hook that tiles windows.
hiding active projects if you have none on profile page
commit b4 pull
merged coverage bull shit
added delete to events
commit after merge
Merge branch 'master' of https://github.com/noeleo/cet
date stuff works for events, but it will have to be changed to dateTime
committing coverage
add delivery messages to status for better feedback
Added routing glossary in text
Removed unsed dependencies from update service
update logging config for variety of use cases, use standard logging for couch-standalone, bump utilities version
fixes errors by correctly calling the init method of super classes within the init methods of the new transforms
Merge pull request #143 from swarbhanu/merging_new_transforms

Fixes errors by calling the init method of super classes within the init methods of the new transforms
sgl: avoid crashes on Mac OS X when no GL context is current
fix comments

I had it all backwards: DrRacket went from "increment" to Greek
capital delta (which makes a lot more sense).
ffi/com: repair for DCOM instance creation
streamline `vectorof' contact implementation

Saves about 10% in a benchmark that applies a
`vectorof' contract frequently.
ffi/unsafe/com: `com-object->eq?' implies `equal?'
racket/gui: fix `reparent' with a `pane%' target
adjust bitmap tests to test judgment form labels (and fix expected result under mac os x)
[機能 #46] アカウント管理機能

* 認証情報更新ダイアログをクローズした際に入力フォームの内容をクリアするように修正

see #46
Fixes lib paths
Add MongoReport
Bump version v0.1.0
updates from original repositary
delete css and java link from template
delete css and java link from template2
add save password in database
Change DESCRIPTION version to 0.99.0 as per BioC review guidlines for
initial submission.
GUI: change build dependency to java 7 for deb and rpm
release 1.4.5
[020] Editing answers in admin
PAHMA-204: Change pahmaEthnographicFileCode to an autocomplete.
Bumping gemspec version to 0.2.0.

This version will include the fix for issue #1 and the recent error updates.
profile api debug 2
Merge branch 'develop' into deploy
Merge branch 'develop' into deploy
back to django 1.4.1
fix olwidget dependency
remake deploy
merge
tests
debug social auth
tests
tests
make really social username
new social auth
Add max age of a year to cookies, fix 408
Merge pull request #427 from remy/cookie-408

Add max age of a year to cookies, fix 408
Include unistd.h for close.
Revert "Include unistd.h for close."

This reverts commit 29da74bdbdf2b2fbc7bac89062b84c767f31618a.

Test revert for buildbot
Revert "Revert "Include unistd.h for close.""

This reverts commit 60b43988fc328bdc26885935d74c8d2346547bf6.
Revert "Revert "Revert "Include unistd.h for close."""

This reverts commit 33de139a59cf1162fd307c4bb8cebe6fd23b1de7.

Revertception.  One more and we're good.
Revert "Revert "Revert "Revert "Include unistd.h for close.""""

This reverts commit 7c32eab828fc5294b551d3f01f4517ab5cfd3111.

And... we're done.
detail create
ball bounces against players
Added something to filter out 0 length reads from paired data.
Added phred-64 quals as the default to calling bowtie.
Merge branch 'master' of github.com:roryk/bipy
cross platform exit.
Merge pull request #1 from yujinrobot/master

Cross platform python exit
v0.0.9rc2b: tiny tweak for --ps with old sosreports
Fixed cover:albumart
Various fixes
lang-co/mode-coco: number updates
dox-5 Import document: Make sure domain values will be respected
coappear: fix potential divide-by-zero.
coappear: adjust styling of links.
Add unit tests for event.

The tests revealed a bug in the previous commit which added the order
parameter, which has now been fixed.
Grunt v0.4 isnt compat with node 0.6. Just take my word it works ;)
delete builed file
Change precision of code splits percentage
better reconnect implementation: call reopen on a separate thread

calling reopen on the dispatch thread is a bad idea in general
here we spawn a separate watcher for the expired session event and
use it to call reopen.
ok! ok! jeez, 'cli_' made me think of 'Command Line Interface' too...sheesh...
fix up default guard case
'protected' does not mean what I think it means

Ok, I *meant* 'private' in ruby, which is like java's protected.

I knew this at one point, and then forgot, apparently.
more s/protected/private/
conditionally call spawn_reconnect thread in the resume method
add the reopen_after_session_expired so we can see it in @eric's stack traces
quiet, threaded_callback
cruft cleanup
beginrescueend.com => smf.sh
Sync with 1.7.9.6
Merge branch 'pt/gitk'

* pt/gitk:
  gitk: fix setting font display with new tabbed dialog layout.
  gitk: fix tabbed preferences construction when using tcl 8.4
Git 1.7.10-rc4

Signed-off-by: Junio C Hamano <gitster@pobox.com>
spec: add missing build dependency

Otherwise:

/usr/bin/perl Makefile.PL PREFIX='/opt/git' INSTALL_BASE=''
Can't locate ExtUtils/MakeMaker.pm in @INC (@INC contains: ...) at Makefile.PL line 1.
BEGIN failed--compilation aborted at Makefile.PL line 1.
make[1]: *** [perl.mak] Error 2
make: *** [perl/perl.mak] Error 2

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Git 1.7.10

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Changed version in setup.py
+ get_npm
+ get_npm
add js2co
latest .sql - more attributes to packages database
Exposing pkey, cert from crypto context to js land

This will solve exposing pkey, cert from pkcs12/pfx to js
issue #4050
Merge branch 'issue4050' of github.com:ssuda/node into issue4050
example failing...
Dodane wyciaganie lat lon i adresu dla eventów
ratio shit
Added bst header
edited for consistency
switched the order of hasOne and belongsTo
Merge pull request #351 from tborg/readme-fix

Readme fix
Updated to use jQuery 1.8
Change the Controller matching regex to the same 
as ember.js.
Merge pull request #361 from bradleypriest/fix-injection-regex

Change the Controller matching regex to be the same as ember.js.
Cherry-pick updates against ember master
Merge branch 'master' into relationship-improvements

Conflicts:
	packages/ember-data/tests/integration/app_test.js
	tests/index.html
Updated tests to jQuery 1.8.2
Fixed failing tests in phantomjs
Update Ember.js
Specify when the giveStoreToControllers injection should run, so that it doesn't run before controllers have been instantiated.
Always coerce IDs into strings.
Merge pull request #398 from lukemelia/fix-injections

Fix issue with the giveStoreToControllers injection running before controllers exist
findAll should return an DS.AdapterPopulatedRecordArray

We introduce all() to return a filter of all records of given type

type filtered RecordArray is always loaded
pass records/recordArrays in `find` and `findMany` adapter methods

This is needed in order to properly implement error handling for find calls and on recordArrays
Fix: saving profile info saves public flag correctly
iniial updates
Update lib/plugins/dbpediaabstractplugin.js
Update index.html
new styling
minor changes
Merge pull request #25 from cristianbara/gh-pages

minor changes
Fix #104: Reset cursor on mode switch.
fastboot devices multiple device list
bump_hp: a nice script to bump haskell packages

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
toi up roi ong coi lai nha
Mark DownloadActionRegistry as private
Add illust_spec.rb and fixtures for it
Fix #num_pages not to raise NodeNotFound
Add a fancier readme in Markdown format
Ext.ia.grid.EditPanel: Fixed buttons disablement toggle logic (closes #172)
Merge branch 'fix-grid-ajouter-#172' into hotfixes-1.0.6
Merge branch 'hotfixes-1.0.6'
Add support for requiring extension scripts.  Force single property property chain objects in order to be able to run specs (since create can still be called directly).  Re-introduce specs in default rake task.
package: update spoon

fix #10
0.3.14
make sure to call pickImpl() if defined
Tweak spike code
The current working directory is used for file path generation.

The directory of files in subdirectories is used as the current working directory whilst processing that file.
emoticons: fix emoticon selector

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
emoticons: removed some unneccessary methods

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
Implements undo functionality

Player can press U to undo their actions
Fix redirect for pages that require a player character
Move towards a more unified widget set.
Priority Queue - Metric
add express and sqlite3 into package.json
Improving Failover and Loadbalance Endpoints

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@148087 a5903396-d722-0410-b921-86c7d4935375
fixing Bug TOOLS-1021

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@127792 a5903396-d722-0410-b921-86c7d4935375
Django rocket requirement changed.
Printer und BarcodeGenerator <3
lxde template
added homepage to pkg.json
Add naive compiler configuration feature.
Adjust input source and type.
minor corrections in  NewCollege
add magnifier icon
Updated the pg personas db
Removed pg incompatible quoting
Merge branch 'next' of github.com:zhdk/madek into next
before :all -> before :each in controller test
Merge branch 'next' of github.com:zhdk/madek into next
added spec for API of meta_data controller
Fixed naming of Filter "...masken -> "ich bin"
cleaned duplicates
Introduce a new way to parse binary files. Further performance testing is needed but if there is no performance drop, this would reduce maintenance, compilation, classes etc. a lot.
Converted the NII parser to the new binary parsing interface.
Switch the NII parser to use typed arrays and optimize the binary read functions which results in a performance gain of ~1 second during loading.
Optimize the loop to get the min/max array values.
Switch the TRK Parser to the typed arrays.
TRK Parser is 1 second faster than before.

There is still room for optimization in this one.
Add functionality to detect the native endianness vs. data endianness and if required, flip the data endianness.
Switch parserMGZ to typed arrays which should

a) be faster
b) be more robust
c) looks nicer for the developer
Introduce typed arrays in the reslice function and also return the 3d array of pixels as a result.
Introduce getter for 3D image data on X.volume.

It is now possible to get the image data like this:

 volume.image[10][10][10] // to get position 10,10,10

The returned value is typed since it is part of a typed array. If the volume type is uShort, than the returned value is uShort.

Closes #84
Switch CRV parser to typed arrays.
New Freesurfer mesh parser work in progress.
The new (faster) Freesurfer parser is in the works.
Freesurfer parser works now again.
Minor speedups to the new versions of the CRV and FSM parsers.
We don't need the old parser anymore.
Fix JSDoc in X.parser.
Fix JSDoc typo.
Remove double declaration of variable.
Clean-up X.parser.
fix error in index.htm
add missing war
PIG-2861: PlanHelper imports org.python.google.common.collect.Lists instead of org.google.common.collect.Lists (jcoveney)

git-svn-id: https://svn.apache.org/repos/asf/pig/trunk@1370070 13f79535-47bb-0310-9956-ffa450edef68
Merge remote-tracking branch 'upstream/trunk' into PIG-1314
implemented jasy doctor to detect uninstalled or not uptodate requirements
doctor: little changes (using loops, info instead of print)
now really using info instead of print
doctor: removed code repeations
Merge pull request #71 from zynga/freds

Initial implementation of "jasy doctor"
Update tabdiv and tutorial for VexTab2.
index comes first in menu
computation of connectivity matrix added
+mailchecker,+waei-xclip,+waei-xclip-twmn
backbone wip
score form lightbox styles finished
Replace $uri with $temp to prevent you from getting: Undefined variable: uri

libraries/Erfurt/Erfurt/Wrapper/LinkeddataWrapper.php:420
libraries/Erfurt/Erfurt/Wrapper/LinkeddataWrapper.php:355
libraries/Erfurt/Erfurt/Wrapper/LinkeddataWrapper.php:144
extensions/datagathering/tests/LinkeddataWrapperTest.php:175
Zombie Mobs
Minor fix
Modifications
Wow, I'm dumb
Merge branch 'alpha' into alpha-teal
NC removed
Fixed it so sounds can be simultaneous
Fixed a special case
Full cleanup. Made structure for larger application.
改进后台主页面
fixed constraints language
Removed echos from uri module.
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Merge pull request #4 from anami90/master

edited readme file
allow merging of undefined groups
precompiled assets
removed GA from video layout
precompiled assets
Merge branch 'master' of https://github.com/BenStW/prod
precompiled
made all button IDs unique
Funkční na Apache
fiddeldede
Added project for Assignment2
Merge branch 'master' of github.com:Bilzac/457a
logo調整放大模糊情況
GST Zoek op Docent
Merge branch 'master' of github.com:Bv202/LeRoy
anasayfa tasarımı yapıldı
sayfa hakkında açıklama eklendi
sayfa hakkında açıklama eklendi
misafir kullanıcıların tarih seçimi için kod eklendi
signo $ antes del precio
Added Health to Entity.cs
Added profile to NeLibTime (iOS only).
Add maven dependencies to README
add more Sounds + mute/unmute
add sum ignores
added warnings on incomplete bits until made
STAGE3URL and STAGE3LOC closer savvy. extraction still to make progress
de-brackettery (in installpackagemanager)
using fully qualified names
updated views and little bit of styling
added bootstrap - article control markup - more styling
up feat config base : add install script to enable theme
up module cec_profiles & script init : move logic into module
up module cec_profiles : last fixes in emails
add module print
add library dompdf
Merge branch 'core'
up module entity to dev
Merge branch 'core'
up module cec_profiles : apologies mail
up mod cec_profiles : improve js
Added generic C++11 transactions
added specs and implemented User.with_any_role
closes #55
edited CHANGELOG for the upcoming 3.2 release
put a note in the README about 1.8 support dropped
bump version to 3.2rc2
[ci skip]
Add release version of chipmunk
Add scrolling mechanic; improve handling of character; various tweaks
Add walls and background
Add commented-out code for SSE2 truecolor->float conversions; sadly it's still not fast enough
Almost all working, but now slow
Asynchronous change the landscape picture
use C-t to open fuf in new tab, j anb k to splits
[HTTP] Formulaires
text improvements and page how it works
Add hover to social links.
md.html template added for markdown convertion.
response.md_text added for json_get_news_by_id
'cancel' button added.
Added unimpaired.vim to config.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/com/siigna/app/controller/Control.scala
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/com/siigna/app/controller/Control.scala
some mouse improvements in wm
linxiao.jz]
Move img to amazon
Avoiding crash by removing observer on destruction

Also adding access to the incremental layout from the graph item.

Change-Id: I9427ee3b0d9c11e654b0902108504c0a2cf34ea9
If vtkContextTransform is non-interactive pass events

Passing events to the base class if the item is non-interactive, this
restores pan, zoom and other interactive features in vtkChartXY.

Change-Id: I7076c0588379360e0e4510867acea10bbd60602d
Revert "removed extra undesirable underscore prefix to fix mangling"

This reverts commit ac84c4cc91cd61230b8a218fdd193731d1a8da59.  The
commit was untested and breaks everywhere because the mangling header is
not included consistently.  More cleanup will be needed to make mangling
work, but for now simply revert the change so VTK builds.

Change-Id: I185b6e44651e7baffa43add0c8d6d3ed8511e5d6
Merge topic 'NetCDF-mangling-fix' into master

ecfb81fd Revert "removed extra undesirable underscore prefix to fix mangling"
Merge topic 'restore-chart-interaction' into master

80e1c8aa If vtkContextTransform is non-interactive pass events
Merge topic 'graphitem-access-layout' into master

ecc6b396 Avoiding crash by removing observer on destruction
Fix invalid merge commit made in v2

Change-Id: I5916d913754f2c6f02881ad86d0e2da7e32c9e40
Merge topic '13077-fix-point-selection-v3' into master

cb20a798 Fix invalid merge commit made in v2
Disable depth peeling during GL2PS export.

Depth peeling renders a giant quad that covers the viewport.
GL2PS can't handle this, resulting in a very incorrect result. This
patch temporarily disables depth peeling while the feedback buffer is
being generated. This has no effect on the postscript output, as GL2PS
sorts polygons internally.

Change-Id: I0eacc2dee6952c0178c98aed85bf6678feb91521
Skip all Context2D handling if not needed.

The GL2PS Exporter currently creates the ContextDevice2D regardless
of whether or not any Context2D drawing is used. This patch fixes this.

Change-Id: If0d6318450a45f27cc3a9f2470f72e5db4cd161a
Fix install rules to respect VTK_INSTALL_NO_DEVELOPMENT.

VTK_INSTALL_NO_DEVELOPMENT is set when we don't want VTK to install development
files such as headers, cmake files etc. Fixing rules to ensure that that's
respected.

Change-Id: I9add2718ce6c9bc9de0f0a637c27ea98d064957d
Merge topic 'fix_install_rules' into master

13caa4d2 Fix install rules to respect VTK_INSTALL_NO_DEVELOPMENT.
Merge topic 'GL2PSFixes' into master

1eb5ef42 Skip all Context2D handling if not needed.
ece74b2a Disable depth peeling during GL2PS export.
US in the begining of the list
Merge branch 'master' of github.com:Knoema/Apps
Installation script-> completed
Installationscript -> complete
Fix rendering of Subversion inputs in the Evaluations table

Broken since commit 75277311ac03ac25e68aee4e0afcd949f262c894.

Fixes #30.
init
got mongo working locally
cleaned assets
testing deploy after heroku remote connected to git account
 all new files -- mongo rails project '
Change the default database for mupip.
Deleteing vertexes.
Add PAC dependencies

Change-Id: I81642b8efd9ea7a0a402c23f2594f19f7a977733
Add glDrawElementsBaseVertex alias
doc: Git documentation - Include picins.sty for easier building
doc: Added .gitignore file to avoid tracking other pdflatex generated files