labofsahil/github-event-dataset-2012 huggingface dataset:
将wiki从irm移至skm模块中
修改scaffold自动生成代码模板
添加wiki模板,并在wiki编辑器中应用模板
为wiki添加文件上传功能
增强wiki查看功能,添加图片,标题显示功能
Merge branch 'bootstrap' of github.com:aronezhang/ironmine into bootstrap
增强事故单编辑器,修正图片与链接无法使用的问题
Bulk Mailer: From Name address to email, error reporting
Initial commit
Merge branch 'master' of github.com:asipahio/ContentCMS
More coherent figure referencing.
fix readme, add defaults
add gemspec file, move to new data and specs
put back cart link and account link
commit 5/3/11
show file names in public/resources (top#index)
removed cheesy clustr map
Zapinani a vypinani funkcionalit aplikace ve views.py, part 2 (misto.html, social, comments, widgeta)
[ARM] arm32: Reduce non-svc stack usage in privileged mode

Only save the arch_regs in abort/undef/irq/fiq mode-stacks and then switch to svc mode for rest of exception handling
This will reduce stack footprint (specially in case of multiprocessor hosts)

Signed-off-by: Anup Patel <anup@brainfault.org>
[CORE] Remove ev_name and idle_vcpu_name from struct vmm_scheduler_ctrl

Signed-off-by: Anup Patel <anup@brainfault.org>
libfreerdp-core: TSG partial cleanup
Added goToLine
Merge branch 'master' of github.com:awbraunstein/emonad

Conflicts:
	src/Buffer.hs
Revert the redcarpet change
Test cases for si-4536.
Added social framework iOS6
moved to social framework #iOS6
Allow loading of rc parameters from a custom-named rc file.

This makes it easier to run a set of scenarios in sequence while unattended.
şablon yaratma öncesi son eklemeler.
added tests for User-Stories 4 and 5
Added a change to line 11
Image Mask Finished :D
corrected title attribute
small modifications
small update
implemented gui_init function
implemented get_params function
Initialize the epggrab mutex and condition variables.
fixed inheritance of package for functions
Make sure the line number for the validation error on @return type is correct and not 0.

- This fixes https://github.com/docblox/docblox/issues/339
Merge pull request #341 from benmatselby/GH-339

Gh 339
Removed ReST element
Fixes incorrect line numbers for #339
Fixes #345: incompatibility with PHP 5.2.x
#40: Show error codes in structure.xml
Fixes #347: added new variable UNPREFIXED_CLASS for external class documentation
Fixes #348: altered precedence order for generating links
closes #344: Wordpress docblock in ./wp-includes/kses.php contained XML characters that caused issues with the export. Altered behaviour to contain data in a CDATA element and the issue is resolved
Fixed more items that should be put in CDATA sections
fixes #349: filtering out @deprecated; same thing as with @todo
Fixed issue with line numbers with error codes and incremental processing was down
RELEASE: Updated version number to 0.18.1
RELEASE: Updated package file to 0.18.1
Merge branch 'release-0.18' into develop
Added support for the @link inline tag
Changed DocBlox into phpDocumentor
Update template documentation.
fixing the README for running the command after install via pear
fixes no bibtex available text
makes parsing files working again
Proofreading, fixing some links
A few tweak my IDE has been pestering me to make for a whiile :P
Update dependency versions.
Added the texture pack feature.
Removed unused imports.
Made the chat message configurable as a feature.
Added missing event listeners for the texture pack feature.
Removed unneeded messages.
Removed another unused import.
added more to hw1 doc and cleaned up pke code
added part C plots and updated hw documentation
added partB files
added standard output files for part C
modified output routines in both codes
added more extensions to gitignore
fixed bug in new jacobian setting
More debug files.
added new icon to the resources
new bigger icon is used (visible in task bar)
Renamed varType to valType in the fields of ValDefStmt
Fixed bug in buildRight and merged Brian's changes to CodeGenerator
Merge branch 'master' of ssh://github.com/tgriswol/ScalEScript
Abstracted each of the verify cases in to their own function
Merge branch 'master' of ssh://github.com/tgriswol/ScalEScript
Merging
Adding transaction control to dispatcher and more unit tests
to be continued
Merge branch 'master' of https://github.com/birdroidcn/weiboAPI
Auto Season name
Merge branch 'refs/heads/master' of
git@github.com:bisanthe/twitstreet.git
removed ActionListener
I have just commited 1.xls file
I have modified the excel file
Before merge
commitig patch file
testing git diff
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-sgrenier
Merge branch 'next-sgrenier' of https://github.com/blackberry-gaming/GamePlay into next-sgrenier
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-sgrenier
Merge branch 'next-sgrenier' of https://github.com/blackberry-gaming/GamePlay into next-sgrenier
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-sgrenier
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-sgrenier
Merge branch 'next-sgrenier' of https://github.com/blackberry-gaming/GamePlay into next-sgrenier
Updated character model and texture with improved face (eyes, improved hair and mouth).
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-sgrenier
Minor updates to the tutorials.
Merge pull request #346 from blackberry-gaming/next-setaylor

Next setaylor
Tweaked blend weights for character sample boy.
Merge pull request #347 from blackberry-gaming/next-sgrenier

Next sgrenier
Regenerated doxygen api docs.
Merge pull request #348 from blackberry-gaming/next-setaylor

Regenerated doxygen api docs.
Merge pull request #84 from blackberry-gaming/next

Next
Fix to Rectangle::contains. (thanks mozeal)
Fixed Rectangle::intersects() method
Added newline back to Rectangle.
Merge pull request #309 from dgough/master

Fixed Rectangle::intersects()
Merge pull request #310 from blackberry/master

rebase from master
Changes requirement that Animations have at least 2 key-values - Animations can be created with on key value.
Removes storage of animations from the AnimationController.
Moves create and destroy animation methods to AnimationTarget.
Adds getAnimation(const char* id) to AnimationTarget.
getAnimation(const char* id) is overridden on Node and Form so that they can recursively drill down into their hierarchy's to search for the first animation with the specified ID.
Updated samples to reflect changes.
Added Gamepad to sample03-character sample.
More comments and refactoring.
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-kcunney

Conflicts:
	gameplay/src/Control.cpp

Fixes build break caused by renaming of Game::exit() to Game::end().
Fixes build break caused by renaming of Game::exit() to Game::end().
Merge pull request #233 from blackberry-gaming/next-ablake

More comments and refactoring.
Merge pull request #234 from blackberry-gaming/next-kcunney

Removes animation from AnimationController
Merge pull request #57 from blackberry-gaming/next

Next
More bootstrap changes, keep up with fixes. Deviating somewhat from implementations now - still keep ing standard syntax.
adding more order helpers within session_helper.
gg git grep
Last of first try at Pyramid before delete
Deleting Pyramid app
Cache is vaguely persistent, interface is vaguely working
Merge branch 'master' of ssh://github.com/bmcorser/apihackday into going-back

Conflicts:
	MPTrends/mptrends/templates/home.pt
Merge branch 'going-back'

Conflicts:
	MPTrends/development.ini
	MPTrends/mptrends/models.py
	MPTrends/mptrends/templates/home.pt
trying to get gear working
Only show paging links that make sense
fix os/version empty issue
optilux.theme tests
layout modification
Ajout d'une première application compilée fonctionnant sous la VM Bootmonkey o/
Removed row.js and grid.js. Changed identation to 2 whitespaces. New small piece of README.
Fix a problem where an error in onItem could result in a bad connection being reused

If an error occurs inside the fn() that onItem calls it would have not been spotted by
condRelease() and that could result in a bad connection being placed back in the
pool of free connections. Under load the package was experiencing this problem manifested
in the following fashion:

  1. A connection gets an i/o timeout during a call to onItem()

  2. The error returned by the function called by onItem() is placed in a new
     err value (because of the :=) but the condRelease() has been set up with
     &err from a previous declaration of err. Therefore err is nil.

  3. condRelease() places the connection back in the free list.

  4. The connection is reused at some point and there's data waiting to be read
     from the previous memcache command that got the i/o timeout. This results
     in (typically) an error from the Sscanf line at line 405 because that line
     ends up trying to parse part of the response that was not previously read
     because of the i/o timeout.

This fix prevents this from happening. If an error occurs the connection will not be
reused.
Close connections that are being discarded

If a TCP connection to memcache is not being returned to the free list (because an error
has occurred on the connection and its reuse is not allowed), explicitly close the
connection.
Merge pull request #5 from jgrahamc/master

Fixed a bug where a bad connection gets reused
bug fix of report sql query in previous commit
changed time formatting to split hour and min
Adapt to markdown syntax
Fix Name/PureName/Moniker leak -- which has no consequences.
Remove duplicate /O3.
Have sqlslave automatically reconnect if mysql itself doesn't do it.
Merge branch 'new-model-framework' of github.com:bredelings/BAli-Phy into new-model-framework
Remove MultiModel::frequencies( ).
Correctly set tuple!
Complain if we forget to use set_p_v_expression( ).
set_p_v_expression( ) doesn't take a string name.
Try some more complex evaluations.
Updated README.md (formatting).
Made it explicitly use to_i for the version.

I did this because it was using it some places and not others which was
causing problems when the user has a version represented as a string in some
places. Plus, consistency is good, ;-)
use correct timerId variable
Ignore packaging files
style of high temp fixed
Converted to IntelliJ/IDEA
Removed dependency on Actionbar Sherlock and rearrange
Remove Actionbar Sherlock
add sina web
Ongoing refactor of ScrollView.
フィード更新[2012/10/17]
cpufreq: ZenX: use a workqueue for hotplugging instead of a realtime …

…thread, ditch the early suspend code for now
3.0.57

Signed-off-by: franciscofranco <franciscofranco.1990@gmail.com>
Fix ZenX
block : Fix Zen  bug in add_request
Minor design hacks
doc fix
fix for bug on older ogr versions
simple type check for nx_shp input
toying with adding attribute export, but tricky with static shapefile schema
issue with importing based on geometries from wkb/wkt
active shapefile import/export development folded into networkx
read_fc on workspaces rather than single files
linting, fix for attributes
linting, setdirection fixes necessary
Merge
style/doc improvements, better handling of undirected caching for flowerrors
parse umlauts and length of zdf video
基本的事件已经全部完成，明天写写错误处理这个页面差不多完成了
Mentat show
Initial Navigation Bar
thru 5a
other figs
winston: add .eps support
Remove description of configuring editors from contrib.
winston: linestyle tweaks
porting simple DICOM parser
fixing #602
fix dicom read of undefined length elements
Issue #445 has a good example, and useful for performance tracking.
Merge branch 'master' of github.com:JuliaLang/julia
might fix #602
Merge branch 'master' of github.com:JuliaLang/julia
moving things not in system image out of jl/
move arpack to extras
install extras
Canvas prop complete.
but background and stroke has some bugs.
Increased VM_MAX_READAHEAD
Added j4fs Module
Change of toolchain to gcc 4.7
Lowered the asv_voltages
in some places been lowered as much as -75mV
mali 3 step mod
fix fuel_alert_wake_lock
gpu voltage, clock and stepcount interfaces
Set VFP CFLAG to NEON
I finished the very basic functionality of the archiver.  I have still have to clean up the code though
The archiver now works.  I'm starting to add more streaming analyses.
remove for test files
Grid with checkboxes
1) Added size limit checks to SpecimenBatchOpAction.
2) SpecimenBatchOpAction sets the time executed on the batch operation object.
3) TestOhsTecanSpecimenPojoReader.processTecanFile() saves data to database.
4) Improvements to CbsrTecanSpecimenPojoReader.
5) OhsTecanSpecimenPojoReader now deals with BigDecimal in a better way when saving volume.
6) SpecimenViewForm now deals with specimens with no processing events.
Added utility script to create sdcard images
Merge branch 'master' of github.com:cdmdata/build_utils
first readme
this is me
Merge branch 'master' of github.com:cedricwang/HelloGit
cleaning up 1
Improved link management in the extension.
Small fixes in the comments
Target for sidebar links are _content instead of _blank
Merge pull request #42 from ceronman/better-links-41

This branch improves links management in the sidebar:

Image links are now handled properly.
Relative URL are also handled properly.
Right clicks are ignored.

Fixex #41. Reviewer: jkakar, terrycojones.
algunas cosas en gestion
registro gestion compra
Cambio base.
Cambios menores.
borrado base de datos.
Cambios minimos.
Algunos archivos a ignorar.
Borrado de lib/JTattoo
Moviendo fuentes a src/main/resources
/database/*.properties a ignore
Revert "/database/*.properties a ignore"

This reverts commit 23b31c290da63cf2bae78b67e801116a5c13c937.
Actualización de readme
- multicatch.
fallback to shelling out to cp when copying final compiled directory

FileUtils.cp_r with :preserve was blowing up when it tried to copy metadata (utime) of a broken symlink.
The symlink would have been 'unbroken' if the cp had finished.  That is, the destination file would eventually have been copied.
The shell version of cp doesn't seem to have this problem.
Plugin Attr Parsing fix

Moving the `parse_params` unset to the helper function instead. There
are some cases where you might still want to know if the user has
`parse_params` set and we only removed it to fix support for
`call_user_func_array()`
Added Contact page
Refactored static pages spec
Added title helper
Finished layout and routes
my exe3
Avoid including link.h.

It's not available on Android. We only use this header to find out if _DYNAMIC
is present; declaring it "extern void*" does the trick.



git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@153431 91177308-0d34-0410-b5e6-96231b3b80d8
tsan: remove unnecessary and wrong include


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@160860 91177308-0d34-0410-b5e6-96231b3b80d8
tasn: do not remember stack traces for sync objects for Go (they are not reported anyway)


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@160861 91177308-0d34-0410-b5e6-96231b3b80d8
Used resharper to clean up a bunch of stuff!
add SepMatrix#sep_count
refactor SepMatrix#seps spec
add 1.txt in test_bug2
[tests] Add test for mongo_client_insert_async().
[client] Only build GBytes structure if there is a channel listener.
modify README to break line
Yay! Exception
Adding some new stuff to the BNC user, such as connect/disconnect
Merge branch 'master' of git@github.com:chrisgward/FurryBNC.git
Fixing compile time error
Merged with the prv.
SAKIII-5988 - small comment update
range submit date added. list rearranged.
index on master: 581cb2f Added a guard against calling a NULL function pointer in nm_ew_multiply.
WIP on master: 581cb2f Added a guard against calling a NULL function pointer in nm_ew_multiply.
Finished the implementation of list_storage_ew_multiply.
Attempting to un-bugger my stashed changes.
Still dealing with screwing up stashed changes.
Empty.
This is getting rediculous.
Merge commit 'stash@{1}'

Conflicts:
	ext/nmatrix/storage/list.cpp
This better be the last time.
Added an updateCastling method to board.c
Implemented initial login/session methods.

[Issue(s) CIAPI-29]
Patch the Tcl test to work.
Cleaning up build files, stand alone group.
Manually bringing rest of TCL tests
removing single export and fixing the exporter for complex plugin resources
nuevos archivos jars
added prototypes, moved code pieces
custom_column_types
Update notes for submitted changes

* Add platform config for vcap staging
Added data to gitignore file. We can create a separate git project for
this.
Added Capistrano deployment recipies and deployment script.
Merge branch 'master' into cmather
Adjust slugs to handle apostrophes and ampersands
Added search page
Adding search tabs to subpages
Erroneously doing a parent check on a new object
Adding custom google font size
Moved custom css to its own partial
Main page forms will always have parent_id set to nil
Added new layout options
More layout options
Correct label for front page display in admin section
Add session support, by adding a session handler to Environment.
Merge pull request #133 from dwijnand/add-session-handler

Add session support, by adding a session handler to Environment.
fixed bug with opening images (f3, enter, left, right, f3)
changed name of install-dev
[Oracle support] - bug fix in shipment process while determining columns definition of a table.
Merge pull request #6 from codjo-sandbox/integration

[Oracle support] - bug fix in shipment process while determining columns definition of a table.
Switch parent pom to the last codjo-pom stable version
[maven-release-plugin] prepare release codjo-control-3.52
[maven-release-plugin] prepare for next development iteration
Switch parent pom to the codjo-pom snapshot version
Compatibility with 2.0.0
Updating requirements and version
More work on tests, pending tests, and behavior to support the examples.
Http method enum.
more refinements to multiple gravity bodies, reworked world cloud placement
Merge remote branch 'upstream/master' into BUG-6210
Merge remote branch 'upstream/master' into BUG-6210
BUG 6210 Request for web service to retrieve all the case variables SOLVED

- The getVariables() web service is not very useful, if you don't know which case variables have been defined.
- Added a new function for web services getAllVariables.
Merge remote branch 'upstream/master' into BUG-6210
Merge remote branch 'upstream/master' into BUG-6210
BUG 6210 Request for web service to retrieve all the case variables SOLVED

- The getVariables() web service is not very useful, if you don't know which case variables have been defined.
- Changed name from getAllVariables to getVariablesNames.
Merge pull request #671 from hector-cortez/BUG-6210

BUG 6210 Request for web service to retrieve all the case variables SOLVED
BUG 9327 Don't validate required field in grid SOLVED

- The object leminud and input disappeared the moment of submit
- I add new instance the object leimund and input
Merge pull request #146 from brayanpereyra/2.0-testing

BUG 9327 Don't validate required field in grid SOLVED
Improved jQuery plugin

Added suggestion anchor that when clicked changes the email to the
suggestion. Also prepared code for future features (ext. status
resolving).
change component-info description
add basic component-search(1) implementation
add null results search behaviour
add component-register(1)
add component-register(1) to package.json
add component.register() implementation
add component-register(1) help to component(1)
change search output to lowercase
add repo to component-search(1) output
wip - assign users to exchanges
change permissions tweak
added sass-cache to gitignore
installed compass
initial compass styles - test
adds new compass generated stylesheets
Add a description on how to contribute changes

Change-Id: I61f1ecb0b035a6e5c7838f4cc35037c102870145
Reviewed-on: http://review.couchbase.org/20611
Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>
CouchKVStore to enable direct I/O to CouchDB files

CouchKVStore is a new backend of ep-engine that utilize couchstore api
to directly read and write to a CouchDB file

Change-Id: I5b305b8dc152eb45ef50d3521530dd9f645d4cc8
Reviewed-on: http://review.couchbase.org/14035
Reviewed-by: Damien Katz <damien@couchbase.com>
Tested-by: Damien Katz <damien@couchbase.com>
MB-4951: Update stats using a single thread

Every time we try to add an item to the database, check to see
if there is room in checkpoint queues, try to see of we have
enough memory for backfill, ... we need to check that we aren't
using more memory than we have allocated to use. This process
required getting stats from tcmalloc and getting stats required
going through a few spin locks and this resulted in a lot of
contention. This fix adds a new thread to the MemoryTracker that
will update the stats every 1/4 second in order to relieve
contention around the spin locks in tcmalloc.

Change-Id: Ibd54bfe1e1cbb6e201d9759d68dbf3399aaf45f0
Reviewed-on: http://review.couchbase.org/14544
Tested-by: Michael Wiederhold <mike@couchbase.com>
Reviewed-by: Chiyoung Seo <chiyoung.seo@gmail.com>
adds some documentation to the mappings
design the interfaces.
remove dead plots from canvas

kind of hacky.  adds 'dead' class to plots scheduled (?) for execution,
filtering them from plotting
Home page rename
added requirements section to the documentation
List got some format changes.  Edit loads dates into the text field.
SPTransaction's toString now shows contact name.  Tired of seeing arrow
next to test.
added other descriptors to outside folder.
JSON is text-based and subset of ECMAScript
Minor simplification in tests project file

TEMPLATE = app is the default.
vim plugin更新
vim更新マージ
navbar linked
把assets proxy分离了还是
system erkennung
update1
1
Adding file abstraction and FileFactory.
Adding MockFile and MockFileFactory.
並び替えのjsを修正
added layout and dashboard view
Basic Create Category functionality
More form work & validation
Updating javadoc for 0.5.2 release.
added docs to forma.testing, removed unused functions, and cleaned up tests; made private functions for the tests of forma.classify.logistic; called big-insert function from forma.hadoop.jobs.cdm
initial commit of hoptree API for MODIS pixel coordinate conversion
added hoptree test namespace
removed plugins
Merge branch 'develop' into feature/hoptree-api
test namespace for hoptree
description of namespace name
Merge branch 'feature/hoptree-api' into develop
moving auth call to api
Update css/bootstrap.css

updated
0000832: Original color STEP model lost in import
Version 31.5.2012
Initial commit
Story summary parsing now working - everything still a bit messy
New corupuses added to configuration directory
consensobot list_text feature added, refactoring
ignore ropevim files
modified web.js to host correct pages
Merge branch 'master' of github.com:danpalmer/eventfull
Suggest creating a preset if none exist
Cleaned up menu generation code
About adjustments, cleanups
adapt naming for merge
Stub out math library
Implement some math functions
Add math test cases
Add: One more iteration of entity system development.
Merge branch 'development' of github.com:dava/dava.framework into development
DF-291 fix allows cycled autotesting
[DF-454] Changed signature of SceneValidator::EnumerateTextures()
Merge branch 'development' of https://github.com/dava/dava.framework into development
Fix: added node update on AddNode()
[DF-185] Added script for TeamCity
[DF-342] UIJoypad::GetStickAngle()
Allow x-properties by default in standard-components
Add invalid-property and invalid-component generic functions
Added tastypie to INSTALLED_APPS.
Added insecure, basic access to measurements.
Added Assay API and docstring explainging it.
Added Glucagon and Pyruvate to possible injection types.
Added Experiment API and documented it in the docstring.
Added API for study objects and updated docstring for data app API.
Documented Treatment objects including docstrings and help_text.  Closes #37
Added links to treatment-detail pages from data table
Moved treatment-detail into a class based view.  Closes #36
Added unit tests for treatment-detail and updated fixtures.  Part of #36 and #33.
Updated treatment_list.html layout
Refactored treatment-list view as a class-based view and wrote unit tests.  Part of issue #33
Merge branch 'tastypie' of github.com:davebridges/mousedb into saltiel
Added APIAuthentication to restrict all API calls in data app.
Added limited MeasurementExperimentResource and MeasurementAssayResource objects to MeasurementResource objects.
Factored out setup and teardown from data/tests.py.  Part of issue #33.
Wrote unit tests for TreatmentModelTests.  Added new test fixtures.  Part of issue #33 and #39.
Documented Treatment model.  Part of issue #33.
Merge with branch saltiel.
Merge with branch saltiel.
Simplified "item delivery" for next dev iteration
Post-braindump update of item session domain model
Update vimux submodule

Signed-off-by: Stephen Celis <stephen@stephencelis.com>
Merge remote-tracking branch 'upstream/master'
Slash handling fix for Windows
Fix adding task
mfi(4): Don't assert lock holding when dumping or during a panic.

FreeBSD's mtx_assert() does it the same way, but we usually translate
mtx_assert() into a KKASSERT(lockstatus(&lock, curthread) != 0).

For now, replace all of these assertions in mfi(4) with a function that
mimics the mtx_assert() behavior of FreeBSD, since some of the asserting
functions are used by the dumping code.

We might think about a real lockassert() function in the future that
has this exception too.

This commit fixes dumping on most supported adapters. Thunderbolt series
adapters still have an (unrelated) command timeout issue which I'm
looking at.

Reported and tested (on a PERC 5/i) by Tim Howe <tim@130collective.org>.
getline(3): Fix segfault caused by NULL pointer

This fixes a segfault seen with pkg's audit function, and effectively syncs
getdelim with FreeBSD.

Taken-from: FreeBSD SVN 197752 (04 OCT 2009)

- Tolerate applications that pass a NULL pointer for the buffer and
  claim that the capacity of the buffer is nonzero.

- If an application passes in a non-NULL buffer pointer and claims the
  buffer has zero capacity, we should free (well, realloc) it anyway.
  It could have been obtained from malloc(0), so failing to free it
  would be a small memory leak.
mpt(4): Mark two functions __printflike.
kernel: Mark two more functions __printflike.
objcache.9: cluster_limit is no longer changed
debug - Add a basic Makefile

- Sync wildcardinfo with current state of affairs.
Merge branch 'master' into gsocdrm_merger
updating conservation
Fixed a mistake I introduced when activating AutoScriopts when playing cards.
Gain#<something> should not work with singular forms of <something>
slides
Merge branch 'master' of https://github.com/dbellavista/edfomai
Converted to maven project structure
Reverse sort option.
Adding basic mutators and resolvers for Riak.
JSR-330 Support.

- Removed direct dependencies on Guice.
- Changed out annotations to JSR 330 from Guice-specific ones.
Adding factories.
Adding findbugs-annotations.
Merge branch 'riak'
#33 Put all exception in the API module
#33 Correct hierarchy of exceptions
#33 Custom error key for the version management
#33 Error management for the applications page
move add locals to exports
put more design walls up and luckily there were no issues design mistakes in this part of the code
add realtek repo
a.txt created
Merge branch 'master' of github.com:dekokun/FBHackTokyo
Passing configuration to breadcrumbs wherever it was missing
getting rid of bootstrap layout class names for spanX classes  - PART 2
bootstrap overrides shared by all themes
replacing themes 'style.less' files with precompiled 'theme.css'
redirect < IE9 users to browsers.html
browser redirect page for IE9 and less
removal of .less files, browser page update
cleanup
dropdowns now active on hover
Fixing recordDefinition lookup
Merge branch '12.08' of github.com:delving/culture-hub into 12.08
Adding SummaryFields
Merge branch 'hotfix/master'
Merge pull request #269 from demaagdk/master

fix issues with realtime olap under gumball
Fix handline of empty resultsets
Merge branch 'master' of github.com:ingenuitas/SimpleSeer
roll back addition of default vals if empty
Fix datetime handling from realtime
Merge pull request #270 from brooksryba/develop

Develop
create directories on build if they don't exist
Merge branch 'develop' of github.com:ingenuitas/SimpleSeer into develop

Conflicts:
	SimpleSeer/template.py
add bugfix for when chartid is null
add a build to the beginning of simpleseer watch
make a new Frame field which stores data natively in epoch
fix missing import
Merge pull request #289 from oostendo/feature/createtime

Feature/createtime
Merge branch 'feature/createtime' into develop
Merge branch 'develop' of github.com:ingenuitas/SimpleSeer into develop
load plugins and add chart to context
Merge pull request #290 from oostendo/feature/ipythontweaks

Feature/ipythontweaks
Add chart fields to to schema for saving underlying olap
Add custom save function to make sure olap is built
creation of charts through chart builder moved to crud
fix repeated textfield
fix issue #412
trying to fix cucumber tests
trying to fix the big problem with jQuery UI modals (if modals have the same z-index, it causes weird behaviours) (WIP)
update norwegian locale
rename norwegian locale when upgrading
bug in prev commit
the upgrade script v1.1 did not work correctly + fix issue #403 (more generally, enhance the way jQuery modals were used within the back-office) + select the first inverse_of value of a has_many field (UI)
Merge pull request #424 from Sharagoz/master

Update Norwegian locale for v2.0
a little bit of cleaning for the upgrade scripts
fix issue #407 (ie: boolean fields take the false value by default)
fix issue #425
fix issue #414
update from upstream
Server Page initialized
Correções relatório
.........................,--,-,
........,--,......_..../(,'')'-'~--,
......./::,-',',')(,,''-,/:::_::::::::.......://(.-':-,.>.||:/. ):::::::::|.
......(/.)...--~'/....)|.....--,::-''
,-,,--~--,::.::/,---,/./:|....,-'
'-,,.'.'.-~'''¯//....,/./:/.......--.,--',¯...>--':::/....|
.....('''''')'-,.)./::::/,,..../
......,''',,-/./:--'''(_./-,
......,--;;;;;;/........,-'.,/
.....//::-,,,,,,-' ' ''' '`
.....\::/::/
finished new linecurv that uses same curves as mappers

still working on new makeparam (spanparam)

finished new linecurv that uses same curves as mappers (i.e. norm, sym
and updwn - with arguments)
Changing gui-options to show vim's icon on alt+tab
[maven-release-plugin] prepare release dijkstrix-super-parent-0.0.6
New XmlHtmlWriter
Merge branch 'master' into production

Conflicts:
	snaplets/heist/templates/foot.tpl
added casm syntax highlighting
cadastro: correcao cadastro de clientes
progaming
progaming
Use dup's of the username and domain instance vars in the SEC_WINNT_AUTH_IDENTITY struct.
Added a SecurityStatus class to convert sspi status codes into a value
that SystemCallError can understand.
Added the get_last_error function as a helper.
Added more error constants.
Altered a couple error handling messages to use the SecurityStatus
helper.
Altered the Server class to use the SecurityStatus helper for a couple
error messages.
Merge branch 'Malmo' into develop
fix the description
Merge branch 'develop' of github.com:djiamnot/transience into develop
added binomial coefficient Integer>>choose: and tests.
added binomial coefficient Integer>>choose: and tests.
moved IntegerTest>>testChoose into Math.
added some more stuff
finish layout and routes
Fixed force of default settings in test environment
Use 'ruby-debug19' gem for 1.9.2, and 'debugger' for 1.9.3+
Clarified ternary operator for ruby-debug in Gemfile
Use 'execjs' on Linux/Mac instead of therubyracer
Add migrations from all engines
Updated bundler_local_development
Added chosen assets to vendor/assets, since we have diverged so much
Removed unnecessary chosen-rails gem. Updated Gemfile.lock for 1.9.3
Merge branch 'master' of https://github.com/fatfreecrm/fat_free_crm
Added schedule times to infowindows
Merge branch 'master' of http://github.com/dnoe10/cs147project
Continued to add to ChIP Primer Design 8-12-12
Continued to add to ChIP Primer Design 8-12-12
Clean up a bit
use startOutlinerActivity function in more places.
footer link color
arg db name rather than db hostname
update style
add shrinkwrap
Visual enchantments
moved model project
Added repo model editor
Support for x86_64 linux added
clean syntax ...
Merge resolve.
changed db initializer
example hosts
Added PDF link on index.rst template
Add IRSSI Theme
Enabled sample averaging, works very well
Added offset correction
Added crude mode, sort of working
correcting ssh key variable assignemnt
updating kv tests
don't use these anymore, and they are broken
changelog
branch merge
moved MultiActorAgent class
updated ubf
branch merge
branch merge
add SimAgent class
add new Simulation:: Agent classes to simulation form func
fixes and cleanup of SimAgent
more cleanup and revision of Simulation Agent classes
base wider to accomidate buttons
Set 4-space indents for PHP
Add Number Juan achievement
GEOT-4199: Exception swallowing in ImageMosaic CatalogBuilder
[GEOT-4202] Add a filter function allowing the extraction of an attribute value
GEOT-4203, improved spatialite support.

Updated sqlitejdbc jar to include support for more platforms, updated driver to
read/write WKB and added isAvialable() check to enable/disable only when native
libs property loaded.
Refactored ogr datastore into jni and bridj based implementations
creating underlying ogr instance on demand rather than in constructor
some robustness checks, checking for null when determining driver, and logging exception during the scanning of typenames
GEOT-4169

modulo function
add ModuloFunction to list of existing functions instead of creating a new FunctionFactory
Fix FunctionName conflict between FilterFunction_numPoints and Filter_Function_numInteriorRing
improvements on general pom config based on geoffrey's recommendations
adjusted update()
Upgrading foreman and dependencies
Fixes #54: Wrapping email delivery with proper locale, and refactoring tests to use shoulda matchers
import source
rename fivetwo -> fiveq
rename src/error.c -> src/err.c
make #/n behavior optional
fiveq.c: expose rawlen
requiref comments
reorganize def of luaL_openlib
cosmetic
yet more err.c movearound
make luaL_openlib only look up 2 stack levels
faststring cosmetic
integrate faststring
unsigned.h fixes
make luaQ_register fiveqplus-only
add pre-5.1 compatibility
rename variable
editing versions of api,err,fiveq
editing version of README
add editing versions of BENEFITS-*
add editing HINTS
cambio en archivo index
Update cocos2dx/platform/ios/CCFileUtils.mm

fixing cannot read data using CCArray::createWithContentsOfFile
Merge pull request #1402 from Horcruxes/patch-1

Update cocos2dx/platform/ios/CCFileUtils.mm
Update AUTHORS
Fix Typo.
Make mGLSurfaceView public so that subclasses can may initialize mGLSurfaceView from a custom xml layout.
Use "-j8" flag to ndk-build when building TestJavaScript

 * If a "-p" for "parallel build" option is set
Added some flexibility to the Cocos2dxActivity. View creation can be overridden by developers that use a custom Layout and custom views.
Merge pull request #1425 from folecr/parallelbuild

Minor update to help speed up build time
Merge pull request #1426 from FlowerpotGames/gles20

Android - Cocos2dxActivity update
Add registry entry for xml-rpc-tests, which now lives in the xml-rpc repository.
Merge pull request #2 from cgay/move-xml-rpc

Add registry entry for xml-rpc-tests, which now lives in the xml-rpc repository
making the tests quieter
cleanedup player + flexibility options

play sound. display with fallback webgl/canvas/nothing
slide to pos #103
format xml
Merge branch 'SliderGoesToEnd'
Fix #67
Fix texture error of slider
Merge pull request #68 from ebencheung/FixTextureErrorOfSlider

Fix #67
Finsihed the post thumbnail
Use backwards-compatible method to determine if string is empty

Signed-off-by: Eddie Ringle <eddie@eringle.net>
Live update settings in demo.

Improve x/y stops and layer limits.
newsletter natal
css tv ra tim bum
ajuste todos css castelo
imagens cmais mobile
Agregue carga de alumnos de Internet
remove unused invite link
mod_info.cpp

http://thisthread.blogspot.com/2012/11/iterating-over-apache-aprtablet.html
add SRP profile
Merge pull request #1 from ranglin/master

Add SRP profile
post game stuff
Updating so that dependencies are only listed once, regardless of how many times they appear in package.xml
Updating to release 0.1.3
NPE and stack overflow protection in corner cases.
add 3rd-person pronoun and verb
hitting stack overflow if trying to print more than 5 sentences.
!!! NOTE !!!
Development of this library stopped! You can use single, double or triple numerizrs for general purpose.
Or contact me if you need specific language support.

- Factory now can output all supported numerizr codes
- Added Numerizrs for Cultures:
-- Azerbaijani
-- Belarussian
-- Basque
-- Bengali
-- Bosnian
-- Breton
Merge branch 'master' of https://github.com/elgris/Numerizr.NET
fix maven target
sublime-pkg.el.in: Removed useless dependencies.
Removed "smex" dependency. Added "project" dependency.
Added CONTRIBUTING file.
Added dependency on smex 2.0
Split sublime.el into several Elisp files
Updated Makefile to support split sublime.el + cleanup
README: tell users they should install gpicker.
Do a bunch of work on Handlebars compilation

The most important change in this commit is an
updated Handlebars that significantly reduces the
precompiled code generated by Ember.Handlebars.
Removed unused terminal title changing code; Updated IRB settings and VIM submodules.
Simplify tweet page url
Merge branch 'step-08-tweetpage' into step-09-profile
Merge branch 'step-09-profile' into step-10-followers
Merge branch 'step-10-followers' into step-11-admin

Conflicts:
	dwitter/dwitter/urls.py
Merge branch 'step-11-admin' into step-12-userpage

Conflicts:
	dwitter/dwitter/urls.py
Merge remote branch 'origin/step-12-userpage' into step-12-userpage
DOC: Fix typo in docstring.
ENYO-1466: fix non-working ServiceRegistry

- localStorage items (auth…) were retrieved & used *after* the services
  were instantiated.

Enyo-DCO-1.1-Signed-off-by: Francois-Xavier KOWALSKI <francois-xavier.kowalski@hp.com>
fix indentation
project delete can now delete project files

Added a new popup to offer a 'delete files' checkbox. Once set, all project
files are deleted. The checkbox is always false by default.
Fix silent error shown in console

Modified the clear function to call removeComponent and removeControls.
Calling one without the other lead to inconsistent results.
ENYO-1408: renamed buttons and kinds from Import to Scan

Enyo-DCO-1.1-Signed-off-by: Dominique Dumont <dominique.dumont@hp.com>
ENYO-1408: ErrorPopup: added a raise method

Enyo-DCO-1.1-Signed-off-by: Dominique Dumont <dominique.dumont@hp.com>
ENYO-1408: DirectorySelector: added a top label

This label is used to indicate the purpose of the selected director.
This label should be updated by the calling kind to help the user
figure out what's going on.

Enyo-DCO-1.1-Signed-off-by: Dominique Dumont <dominique.dumont@hp.com>
ENYO-1408: create project in 2 steps: select dir and set project name

ProjectWizard has been modified to propose project creation in 2 steps:
- select (create if necessary) project folder
- set project name (pre-set with folder name).

Enyo-DCO-1.1-Signed-off-by: Dominique Dumont <dominique.dumont@hp.com>
ENYO-1408: Directory selector: added a headerText published attribute

This attribute simplifies the update of the header text:

  this.$.selectDirectoryPopup.setHeaderText('yada yada');

instead of

  this.$.selectDirectoryPopup.$.header.setContent("yada yada");

Enyo-DCO-1.1-Signed-off-by: Dominique Dumont <dominique.dumont@hp.com>
ENYO-1408: hide popup when canceled

Directly hide popup at this level, then fire a doCancel event.

Enyo-DCO-1.1-Signed-off-by: Dominique Dumont <dominique.dumont@hp.com>
ENYO-1408: Simplified project scan popup

project scan is now a one step wizard: fire a directory selector
and scan the selected directory.

As a consequence:
- ProjectScanPopup inherits from DirectorySelector.
- ProjectWizardAny was no longer needed and was integrated in
  ProjectWizardCreate

Enyo-DCO-1.1-Signed-off-by: Dominique Dumont <dominique.dumont@hp.com>
ENYO-1408: Hide new folder button when scanning project

Scanning a new directory does not make sense.

Enyo-DCO-1.1-Signed-off-by: Dominique Dumont <dominique.dumont@hp.com>
ENYO-1408: Merge branch 'master' into ENYO-1408

Conflicts:
	project-view/source/ProjectView.js

Enyo-DCO-1.1-Signed-off-by: Dominique Dumont <dominique.dumont@hp.com>
ENYO-1166: use struff.destroy() instead of should-be-protected functions

As suggested by Ben, replace calls :

  node.removeComponent(stuff);
  node.removeControl(stuff);

with

  stuff.destroy();

Enyo-DCO-1.1-Signed-off-by: Dominique Dumont <dominique.dumont@hp.com>
ENYO-1166: Merge branch 'master' into ENYO-1166

Conflicts:
	project-view/source/ProjectList.js

Enyo-DCO-1.1-Signed-off-by: Dominique Dumont <dominique.dumont@hp.com>
Merge pull request #117 from enyojs/ENYO-1166

Enyo-1166: Can now delete project's file along with project
typo fix
Merge pull request #120 from enyojs/ENYO-1408

Enyo-1408: Remodel project create and project scan (formerly import)
Merge branch 'master' of github.com:enyojs/ares-project into ENYO-994
ENYO-1213: Warn the user before reloading ou getting out of Ares

Enyo-DCO-1.0-Signed-off-by: Yves Del Medico <yves.del-medico@hp.com>
ENYO-1278: On Mac, launch Auto-Completion on Ctrl-Space

Enyo-DCO-1.0-Signed-off-by: Yves Del Medico <yves.del-medico@hp.com>
ENYO-1213: Warn the user before reloading or getting out of Ares

Enyo-DCO-1.1-Signed-off-by: Yves Del Medico <yves.del-medico@hp.com>
ENYO-1213: Fixed bad back behavior when pressing Delete on Mac
- User input are now handled by ACE.
- Arrows, Return and Escape keys are intercepted by auto-completion code.

Enyo-DCO-1.1-Signed-off-by: Yves Del Medico <yves.del-medico@hp.com>
ENYO-1213: Fixed bad back behavior when pressing Delete on Mac
- Also handle cursor changes
- Tested on Mac: Chrome, Firefox and Safari

Enyo-DCO-1.1-Signed-off-by: Yves Del Medico <yves.del-medico@hp.com>
ENYO-1466: AccountConfigurator working with PhoneGapBuild

- CAVEATS: layout of other users of ProvidersList may be affected.

Enyo-DCO-1.1-Signed-off-by: Francois-Xavier KOWALSKI <francois-xavier.kowalski@hp.com>
Revert "Test of Jason's branch"

This reverts commit e5203d0248687e82506dbff6a57dccc7be22f58e.
Revert "Revert "Test of Jason's branch""

This reverts commit f59db2877b6d907baaade89ff664e3e71fcb5862.
Updated KoGrid to be koGrid.
making it so selections can persist if user desires.
renamed orset to or_set to avoid confusion with ordsets
updated the README to reflect the change I made to the module name
override XtextBuilder with our own, to remove full workspace lock
Pass a dev flag to the server to control the options better. Add a common config package. Add a basic home template.
introduce option groups
shorter help message for --all
no period needed here
abbrev usage string until cmd-line api is ready
Added Rainbow Parentheses
Wrote the function to access structures. Untested.
beer table and js
fix index
omniauth
add ibu
add ibus
table fix
add build_auth method to user
auth belongs to user
average rating and such
add edit rating functionality
auth fix
redirect root
fixes
fixes
add loading to col sort
ibu int
IPA
remove year column
make abv float
abv
Code cleanup

git-svn-id: https://swqp.googlecode.com/svn/branches/develop@393 ad556e03-cac2-6347-23ed-c35bd7ae8d18
Started implementing webapp and tying together different components

git-svn-id: https://swqp.googlecode.com/svn/branches/develop@394 ad556e03-cac2-6347-23ed-c35bd7ae8d18
Merged github/develop into develop
SOC/FQA-400: Create common function: People connection
ECMS/FQA-186 Admin/Categories and Tags/Manage Tags/Management
[+] Added MakeUnsigned
[+] Performing more sema
allow deleting of cookies
changed paths, shorter config
Merge branch 'release/v2.1.2' into develop
port change
shrinkwrap deps
version bump
Merge branch 'release/v2.1.3'
Merge branch 'release/v2.1.3' into develop
hide mask
package.json
compile underscore
only get plain/text data
reafactor methods
exclude underscore from build
remove draggable attr from path el
formatting
formatting
Merge branch 'feature/caching' into develop
version bump
shrinkwrap deps
Merge branch 'release/v2.1.4'
Finish chap 3
Add hello world script by Java
added debug output

extended test funciton
added debug output
fixed git error
Merge branch 'MemoryPool' into Octree

Conflicts:
	LostIsland/MemoryPool.cpp
	LostIsland/MemoryPool.h
fixed git error
moved and reorganized Terrain
enhanced debug output
Merge branch 'MemoryPool' into Octree
Reverse patent application support, as this can be handled through genre with less complexity and more flexibility.
All styles: abbrevs and delimiter tuning for ca unreported cases
WCS + CMS: populate delimiter adjustment for ca unreported cases from WCS to CMS
Fix Google Analytics script, moved to the head.
Added ListView example (minimal)
Fixed typo
Fixed styles for alerts
Sync css
Added License file, fixed Issue #20
Fix Issue #21
First drop for Wizard pages (not yet finished)
Added sample code and litthe help text.
Fix typo
Fixed missed canges...
Drop v0.6
Fixed index
Fixed css, added little responsive fix. Fixed Index
Fix index
Buttons & form fixes. Added DatePicker.
fecha depois de ler
Colcando a precificacao e testando o git
Moved kuudesmauste page to its rightful place

Again a file misplaced by the export
correct isSatisfied for SpareCPU
Adicionado suporte a codificacao em...SHA-512 (agora eu quero ver aonde estao os hackers)
Adicionados botoes de editar e apagar
Correcao de link dos botoes
Arquivos de build
Modificado banco de dados para suportar senhas em SHA-512
Adicionado suporte a data de notificacao nula
fixed the issue number 1 about the values in the combo box of the receipt
Added the EJB tests for the Customer
links to vote
Finish now Diego =]
.de mit .ch ausgetauscht
boss fight!
Update doc/guides/4 - Refinery Extensions/2 - Multiple Resources in an Extension.textile

added --skip-frontend and --namespace
item name validation.
Merge branch 'master' of github.com:flurdy/shoppinglist
Adding in the new UpdateManager

The UpdateManager will take care of changes in the INI files from previous versions of Aurora

This is and will always be a WIP since Aurora changes a lot
0616
0616
0326
0326
Command line arguments support added

A new struct settings was added to store two command line arguments:
  * outfile
  * top-pkgs

To parse command line arguments boost::program_options library was used
adding a function to main.cpp to do parsing stuff.

A settings reference attribute was added to dpkg class.
Now this class uses settings reference to access to output_file and
top_packages values now.
Merge pull request #3 from rmunoz/command-line-args

Command line arguments support added
Use command line options
Default output to cwd
Merge branch 'command-line'
aha, 'demux' is the simulink way of doing vector-to-multiple-signals
Fixing manager.
fix refrences for old style.
remove old location view method.
added spi source and header files
Merge pull request #3 from gunzo/master

Hey hannes,
identify nPA by selecting EF.CardAccess
Backward bracket. Fixes build.
- Add my author entity
- Move myself to committers from contributors
- Add my news entry
- Add my PGP public key

Approved by:	makc (mentor)


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@39520 ba62deef-0ea0-e111-9166-001e4f0fb9b1
- Add a sect id to the Adding/Removing files section of the
  Subversion Primer
- Clarify 'FreeBSD=%H' is the 'svn:keywords' property that is set
- Replace a ulink with an xref to the new section id

Suggested by:	gavin


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@38925 ba62deef-0ea0-e111-9166-001e4f0fb9b1
- Merge the following from the English version:

  r38412 -> r39483      head/ja_JP.eucJP/htdocs/ports/index.sgml


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@39515 ba62deef-0ea0-e111-9166-001e4f0fb9b1
r38826 -> r38845        Fix title capitalization and markup.


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@38894 ba62deef-0ea0-e111-9166-001e4f0fb9b1
user patch to enable native fullscreen support on MacOSX
1) Updated CMakeLists
Removed build_headers
ValueCriteria with new L10nStrategy
Merge pull request #5 from slawert/master

Value Criteria
changed k-means
Couple of spare smiley images removed.

Should have been deleted when these got moved to smiley_pack